Removed Audio::msgShowInstrumentGui and msgShowInstrumentNativeGui.

5 files changed, 35 insertions, 26 deletions

diff --git a/muse2/ChangeLog b/muse2/ChangeLog
index 65f0dd45..76a0d19a 100644
--- a/muse2/ChangeLog
+++ b/muse2/ChangeLog
@@ -9,6 +9,7 @@
           TODO: processMidi could do stuck notes better by bypassing their insertion in the play event list,
                  also applies to seek/stop handler block, but I'm not sure about the time comparisons.   
         - Removed MidiSeq::msgSeek and ::msgStop, and removed calls from Audio::seek and ::stopRolling. (Tim) 
+          Removed Audio::msgShowInstrumentGui and ::msgShowInstrumentNativeGui.
         - Some more separation of ALSA and Jack Midi, one step closer to configurable choice of either/or. (Tim)
         - Massive cleanup of audio, midi, mididev, alsamidi, jackmidi, dssi modules. Moved some stuff from 
            Audio::processMidi into MidiDevice. (Tim)
diff --git a/muse2/muse/arranger/tlist.cpp b/muse2/muse/arranger/tlist.cpp
index db83ad71..80deb2df 100644
--- a/muse2/muse/arranger/tlist.cpp
+++ b/muse2/muse/arranger/tlist.cpp
@@ -707,11 +707,13 @@ void TList::oportPropertyPopupMenu(Track* t, int x, int y)
         //if (ract == act) {
         if (ract == gact) {
               bool show = !synth->guiVisible();
-              audio->msgShowInstrumentGui(synth, show);
+              //audio->msgShowInstrumentGui(synth, show);
+              synth->showGui(show);
               }
         else if (ract == nact) {
               bool show = !synth->nativeGuiVisible();
-              audio->msgShowInstrumentNativeGui(synth, show);
+              //audio->msgShowInstrumentNativeGui(synth, show);
+              synth->showNativeGui(show);
               }
         delete p;
         return;
@@ -758,11 +760,13 @@ void TList::oportPropertyPopupMenu(Track* t, int x, int y)
       //if (ract == act) {
       if (ract == gact) {
             bool show = !port->guiVisible();
-            audio->msgShowInstrumentGui(port->instrument(), show);
+            //audio->msgShowInstrumentGui(port->instrument(), show);
+            port->instrument()->showGui(show);
             }
       else if (ract == nact) {
             bool show = !port->nativeGuiVisible();
-            audio->msgShowInstrumentNativeGui(port->instrument(), show);
+            //audio->msgShowInstrumentNativeGui(port->instrument(), show);
+            port->instrument()->showNativeGui(show);
             }
       delete p;
       
diff --git a/muse2/muse/audio.cpp b/muse2/muse/audio.cpp
index 60eb5c73..f50d7d75 100644
--- a/muse2/muse/audio.cpp
+++ b/muse2/muse/audio.cpp
@@ -80,8 +80,8 @@ const char* seqMsgList[] = {
       "SEQM_SCAN_ALSA_MIDI_PORTS",
       "SEQM_SET_AUX",
       "SEQM_UPDATE_SOLO_STATES",
-      "MIDI_SHOW_INSTR_GUI",
-      "MIDI_SHOW_INSTR_NATIVE_GUI",
+      //"MIDI_SHOW_INSTR_GUI",
+      //"MIDI_SHOW_INSTR_NATIVE_GUI",
       "AUDIO_RECORD",
       "AUDIO_ROUTEADD", "AUDIO_ROUTEREMOVE", "AUDIO_REMOVEROUTES",
       //"AUDIO_VOL", "AUDIO_PAN",
@@ -686,12 +686,12 @@ void Audio::processMsg(AudioMsg* msg)
             case SEQM_SCAN_ALSA_MIDI_PORTS:
                   alsaScanMidiPorts();
                   break;
-            case MIDI_SHOW_INSTR_GUI:
-                  midiSeq->msgUpdatePollFd();
-                  break;
-            case MIDI_SHOW_INSTR_NATIVE_GUI:   
-                  midiSeq->msgUpdatePollFd();
-                  break;
+            //case MIDI_SHOW_INSTR_GUI:
+            //      midiSeq->msgUpdatePollFd();
+            //      break;
+            //case MIDI_SHOW_INSTR_NATIVE_GUI:   
+            //      midiSeq->msgUpdatePollFd();
+            //      break;
             case SEQM_ADD_TEMPO:
             case SEQM_REMOVE_TEMPO:
             case SEQM_SET_GLOBAL_TEMPO:
diff --git a/muse2/muse/audio.h b/muse2/muse/audio.h
index 03e48e23..90acae13 100644
--- a/muse2/muse/audio.h
+++ b/muse2/muse/audio.h
@@ -74,8 +74,8 @@ enum {
       SEQM_SCAN_ALSA_MIDI_PORTS,
       SEQM_SET_AUX,
       SEQM_UPDATE_SOLO_STATES,
-      MIDI_SHOW_INSTR_GUI,
-      MIDI_SHOW_INSTR_NATIVE_GUI,
+      //MIDI_SHOW_INSTR_GUI,
+      //MIDI_SHOW_INSTR_NATIVE_GUI,
       AUDIO_RECORD,
       AUDIO_ROUTEADD, AUDIO_ROUTEREMOVE, AUDIO_REMOVEROUTES,
       //AUDIO_VOL, AUDIO_PAN,
@@ -233,8 +233,8 @@ class Audio {
       void msgRemoveSig(int tick, int z, int n, bool doUndoFlag = true);
       void msgAddKey(int tick, int key, bool doUndoFlag = true);
       void msgRemoveKey(int tick, int key, bool doUndoFlag = true);
-      void msgShowInstrumentGui(MidiInstrument*, bool);
-      void msgShowInstrumentNativeGui(MidiInstrument*, bool);
+      //void msgShowInstrumentGui(MidiInstrument*, bool);
+      //void msgShowInstrumentNativeGui(MidiInstrument*, bool);
       void msgPanic();
       void sendMsg(AudioMsg*);
       bool sendMessage(AudioMsg* m, bool doUndo);
diff --git a/muse2/muse/seqmsg.cpp b/muse2/muse/seqmsg.cpp
index 6c3fc5ab..3ef2464b 100644
--- a/muse2/muse/seqmsg.cpp
+++ b/muse2/muse/seqmsg.cpp
@@ -757,6 +757,7 @@ void Audio::msgPlay(bool val)
             }
       }
 
+/*
 //---------------------------------------------------------
 //   msgShowInstrumentGui
 //---------------------------------------------------------
@@ -764,11 +765,13 @@ void Audio::msgPlay(bool val)
 void Audio::msgShowInstrumentGui(MidiInstrument* instr, bool val)
       {
       instr->showGui(val);
-      AudioMsg msg;
-      msg.id = MIDI_SHOW_INSTR_GUI;
-      msg.p1 = instr;
-      msg.a  = val;
-      sendMessage(&msg, false);
+      // No need for this - it called msgUpdatePollFd which has nothing
+      //  to do with showing a gui.
+      //AudioMsg msg;
+      //msg.id = MIDI_SHOW_INSTR_GUI;
+      //msg.p1 = instr;
+      //msg.a  = val;
+      //sendMessage(&msg, false);
       }
 
 //---------------------------------------------------------
@@ -778,12 +781,13 @@ void Audio::msgShowInstrumentGui(MidiInstrument* instr, bool val)
 void Audio::msgShowInstrumentNativeGui(MidiInstrument* instr, bool val)
       {
       instr->showNativeGui(val);
-      AudioMsg msg;
-      msg.id = MIDI_SHOW_INSTR_NATIVE_GUI;
-      msg.p1 = instr;
-      msg.a  = val;
-      sendMessage(&msg, false);
+      //AudioMsg msg;
+      //msg.id = MIDI_SHOW_INSTR_NATIVE_GUI;
+      //msg.p1 = instr;
+      //msg.a  = val;
+      //sendMessage(&msg, false);
       }
+*/
 
 //---------------------------------------------------------
 //   msgAddTrack