Skip to content

Commit

Permalink
Merge pull request #188 from GlitchedCode/monocompile_fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Xrayez authored Apr 1, 2022
2 parents 788f001 + ee1ca98 commit e194846
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion doc/MidiFile.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<member name="data" type="PoolByteArray" setter="set_data" getter="get_data" default="PoolByteArray( )">
A stream of bytes which represents MIDI data. This data is not meant to be modified, as MIDI files are imported automatically.
</member>
<member name="format" type="int" setter="set_format" getter="get_format" default="0">
<member name="format" type="Format" setter="set_format" getter="get_format" default="0">
Represents the internal format of the [MidiFile] data. This is set automatically at import time.
</member>
</members>
Expand Down
4 changes: 2 additions & 2 deletions scene/audio/midi_player.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ class MidiFile : public Resource {
FORMAT_SF2,
};

int format = FORMAT_MIDI; // Default.
Format format = FORMAT_MIDI; // Default.

Error load(const String fileName);

void set_format(Format p_format) { format = p_format; }
int get_format() const { return format; }
Format get_format() const { return format; }

void set_data(const PoolVector<uint8_t> &p_data);
PoolVector<uint8_t> get_data() const;
Expand Down

0 comments on commit e194846

Please sign in to comment.