[Lmuse-cvs-traffic] muse/muse/mixer mstrip.cpp,1.9.2.11,1.9.2.12

[Mathias G. <lun...@us...>]

Update of /cvsroot/lmuse/muse/muse/mixer
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5154/muse/mixer

Modified Files:
      Tag: REL07
	mstrip.cpp 
Log Message:
see changelog

Index: mstrip.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/mixer/mstrip.cpp,v
retrieving revision 1.9.2.11
retrieving revision 1.9.2.12
diff -C2 -d -r1.9.2.11 -r1.9.2.12
*** mstrip.cpp	10 Jun 2009 00:34:59 -0000	1.9.2.11
--- mstrip.cpp	25 Oct 2009 19:26:05 -0000	1.9.2.12
***************
*** 365,368 ****
--- 365,374 ----
  void MidiStrip::songChanged(int val)
        {
+       if (mute && (val & SC_MUTE)) {      // mute && off
+             mute->blockSignals(true);
+             mute->setOn(track->isMute());
+             updateOffState();
+             mute->blockSignals(false);
+             }
        if (solo && (val & SC_SOLO)) 
        {
***************
*** 867,868 ****
--- 873,892 ----
        }
        
+ //---------------------------------------------------------
+ //   updateOffState
+ //---------------------------------------------------------
+ 
+ void MidiStrip::updateOffState() // Ripped from AudioStrip, hehh(mg)
+       {
+       bool val = !track->off();
+       slider->setEnabled(val);
+       //KNOB* gcon = &controller[KNOB_PAN]; // TODO: Pan ctrl
+       //gcon->setOn(val);
+       label->setEnabled(val);
+       if (record)
+             record->setEnabled(val);
+       if (solo)
+             solo->setEnabled(val);
+       if (mute)
+             mute->setEnabled(val);
+       }