merged with trunk

1 files changed, 2 insertions, 31 deletions

diff --git a/muse2/muse/globals.cpp b/muse2/muse/globals.cpp
index d50ea1eb..112b9890 100644
--- a/muse2/muse/globals.cpp
+++ b/muse2/muse/globals.cpp
@@ -103,6 +103,7 @@ QString lastWavePath(".");
 QString lastMidiPath(".");
 
 bool debugMode = false;
+bool unityWorkaround = false;
 bool debugMsg = false;
 bool heavyDebugMsg = false;
 bool midiInputTrace = false;
@@ -129,18 +130,7 @@ const char* midi_file_pattern[] = {
 //  the file is a pipe, and pipes can't seek !
 // This results in a corrupted midi file from MidiFile::writeTrack(). 
 // So exporting compressed midi has simply been disabled here for now...
-/*
-const char* midi_file_save_pattern[] = {
-      "Midi (*.mid)",
-      "gzip compressed Midi (*.mid.gz)",
-      "bzip2 compressed Midi (*.mid.bz2)",
-      "Karaoke (*.kar)",
-      "gzip compressed karaoke (*.kar.gz)",
-      "bzip2 compressed karaoke (*.kar.bz2)",
-      "All Files (*)",
-      0
-      };
-*/
+// For re-enabling, add .mid.gz and .mid.bz2 and same for .kar again
 const char* midi_file_save_pattern[] = {
       QT_TRANSLATE_NOOP("file_patterns", "Midi (*.mid)"),
       QT_TRANSLATE_NOOP("file_patterns", "Karaoke (*.kar)"),
@@ -181,15 +171,6 @@ const char* image_file_pattern[] = {
       0
       };
 
-// Not used.
-/*
-const char* ctrl_file_pattern[] = {
-      "ctrl Files (*.ctrl *.ctrl.gz *.ctrl.bz2)",
-      "All Files (*)",
-      0
-      };
-*/
-
 const char* part_file_pattern[] = {
       QT_TRANSLATE_NOOP("file_patterns", "part Files (*.mpt *.mpt.gz *.mpt.bz2)"),
       QT_TRANSLATE_NOOP("file_patterns", "All Files (*)"),
@@ -203,14 +184,6 @@ const char* part_file_save_pattern[] = {
       0
       };
 
-/*
-const char* plug_file_pattern[] = {
-      QT_TRANSLATE_NOOP("file_patterns", "part Files (*.pre)"),
-      QT_TRANSLATE_NOOP("file_patterns", "All Files (*)"),
-      0
-      };
-*/
-
 const char* preset_file_pattern[] = {
       QT_TRANSLATE_NOOP("file_patterns", "Presets (*.pre *.pre.gz *.pre.bz2)"),
       QT_TRANSLATE_NOOP("file_patterns", "All Files (*)"),
@@ -247,7 +220,6 @@ const char* audio_file_pattern[] = {
       0
 };
 
-///Qt::ButtonState globalKeyState;
 Qt::KeyboardModifiers globalKeyState;
 
 // Midi Filter Parameter
@@ -275,7 +247,6 @@ QAction* punchoutAction;
 QAction* recordAction;
 QAction* panicAction;
 
-//AudioMixerApp* audioMixer;
 MusEGui::MusE* muse = 0;
 
 int preMeasures = 2;