summaryrefslogtreecommitdiff
path: root/muse2/muse/midifile.cpp
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2011-05-13 12:56:25 +0000
committerFlorian Jung <flo@windfisch.org>2011-05-13 12:56:25 +0000
commit8aed0b79c9b28af69ef67e858992385ea074df63 (patch)
treea31cbe67dcac93b4f67836ebfabcc27561ed5f9a /muse2/muse/midifile.cpp
parent1c431bd67567104ba9e026ae75ba479f56d387a2 (diff)
parent2b2776be8c1f6c90b5887ef5453321e06c6aea26 (diff)
merged with trunk
midi files default to type=GM now changed wildcards for opening file. midi is now selectable
Diffstat (limited to 'muse2/muse/midifile.cpp')
-rw-r--r--muse2/muse/midifile.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/muse2/muse/midifile.cpp b/muse2/muse/midifile.cpp
index 319152d7..21e3e882 100644
--- a/muse2/muse/midifile.cpp
+++ b/muse2/muse/midifile.cpp
@@ -60,7 +60,7 @@ MidiFile::MidiFile(FILE* f)
{
fp = f;
curPos = 0;
- _mtype = MT_UNKNOWN;
+ _mtype = MT_GM;
_error = MF_NO_ERROR;
_tracks = new MidiFileTrackList;
}
@@ -325,7 +325,7 @@ int MidiFile::readEvent(MidiPlayEvent* event, MidiFileTrack* t)
}
if (buffer[len-1] != 0xf7) {
printf("SYSEX endet nicht mit 0xf7!\n");
- // Forstsetzung folgt?
+ // Fortsetzung folgt?
}
else
--len; // don't count 0xf7