[Lmuse-cvs-traffic] muse/muse/arranger trackinfo.cpp, 1.10.2.4, 1.10.2.5

[terminator356 <ter...@us...>]

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

Modified Files:
      Tag: REL07
	trackinfo.cpp 
Log Message:
See ChangeLog

Index: trackinfo.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/arranger/trackinfo.cpp,v
retrieving revision 1.10.2.4
retrieving revision 1.10.2.5
diff -C2 -d -r1.10.2.4 -r1.10.2.5
*** trackinfo.cpp	10 Feb 2009 01:18:57 -0000	1.10.2.4
--- trackinfo.cpp	18 Feb 2009 04:51:17 -0000	1.10.2.5
***************
*** 220,223 ****
--- 220,224 ----
        int lbank   = midiTrackInfo->iLBank->value();
        int prog    = midiTrackInfo->iProgram->value();
+       //MidiPort *mp = &midiPorts[port];
  
        if (hbank > 0 && hbank < 129)
***************
*** 234,237 ****
--- 235,257 ----
              prog = 0xff;
  
+       /*
+       int curval = mp->hwCtrlState(channel, CTRL_PROGRAM);
+       int lastv = mp->lastValidHWCtrlState(channel, CTRL_PROGRAM);
+       
+       if(prog == 0xff)
+       {  
+         //if(lastv != CTRL_VAL_UNKNOWN || ((lastv & 0xffffff) != 0xffffff))
+         if(lastv != CTRL_VAL_UNKNOWN)
+           audio->msgSetHwCtrlState(mp, channel, CTRL_PROGRAM, CTRL_VAL_UNKNOWN);
+       }
+       else
+       {
+         if(lastv == CTRL_VAL_UNKNOWN)
+           program = 0xffff00 | prog;
+         else
+           program = (lastv & 0xffff00) | prog;
+       }
+       */  
+         
        program = (hbank << 16) + (lbank << 8) + prog;
        MidiPlayEvent ev(0, port, channel, ME_CONTROLLER, CTRL_PROGRAM, program);