merged with trunk

midi files default to type=GM now
changed wildcards for opening file. midi is now selectable

2 files changed, 4 insertions, 2 deletions

diff --git a/muse2/muse/globals.cpp b/muse2/muse/globals.cpp
index 6c0bbbc6..f8ae4454 100644
--- a/muse2/muse/globals.cpp
+++ b/muse2/muse/globals.cpp
@@ -174,10 +174,12 @@ const char* med_file_save_pattern[] = {
 */      
 const QStringList med_file_pattern =  
       QT_TRANSLATE_NOOP("@default", 
+      QString("all known files (*.med *.med.gz *.med.bz2 *.mid *.midi *.kar);;") +
       QString("med Files (*.med *.med.gz *.med.bz2);;") +
       QString("Uncompressed med Files (*.med);;") +
       QString("gzip compressed med Files (*.med.gz);;") +
       QString("bzip2 compressed med Files (*.med.bz2);;") +
+      QString("mid Files (*.mid *.midi *.kar);;") +
       QString("All Files (*)")).split(";;");
 const QStringList med_file_save_pattern =  
       QT_TRANSLATE_NOOP("@default", 
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