[Lmuse-cvs-traffic] muse/muse/ctrl ctrlpanel.cpp, 1.10.2.5, 1.10.2.6

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

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

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

Index: ctrlpanel.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/ctrl/Attic/ctrlpanel.cpp,v
retrieving revision 1.10.2.5
retrieving revision 1.10.2.6
diff -C2 -d -r1.10.2.5 -r1.10.2.6
*** ctrlpanel.cpp	9 Mar 2009 02:05:18 -0000	1.10.2.5
--- ctrlpanel.cpp	1 Apr 2009 01:37:11 -0000	1.10.2.6
***************
*** 18,21 ****
--- 18,22 ----
  #include <qtooltip.h>
  #include <qsizepolicy.h>
+ #include <qtimer.h>
  #include <math.h>
  
***************
*** 116,120 ****
        dbox->addWidget(_dl);
        dbox->addStretch();
!       connect((QObject*)heartBeatTimer, SIGNAL(timeout()), SLOT(heartBeat()));
        inHeartBeat = false;
        }
--- 117,121 ----
        dbox->addWidget(_dl);
        dbox->addStretch();
!       connect(heartBeatTimer, SIGNAL(timeout()), SLOT(heartBeat()));
        inHeartBeat = false;
        }
***************
*** 233,242 ****
          kiv &= 0x7f;
          kiv |= 0xffff00;
!         MidiPlayEvent ev(song->cpos(), outport, chan, ME_CONTROLLER, _dnum, kiv);
          audio->msgPlayMidiEvent(&ev);
        }
        else
        {
!         MidiPlayEvent ev(song->cpos(), outport, chan, ME_CONTROLLER, _dnum, lastv);
          audio->msgPlayMidiEvent(&ev);
        }
--- 234,245 ----
          kiv &= 0x7f;
          kiv |= 0xffff00;
!         //MidiPlayEvent ev(song->cpos(), outport, chan, ME_CONTROLLER, _dnum, kiv);
!         MidiPlayEvent ev(0, outport, chan, ME_CONTROLLER, _dnum, kiv);
          audio->msgPlayMidiEvent(&ev);
        }
        else
        {
!         //MidiPlayEvent ev(song->cpos(), outport, chan, ME_CONTROLLER, _dnum, lastv);
!         MidiPlayEvent ev(0, outport, chan, ME_CONTROLLER, _dnum, lastv);
          audio->msgPlayMidiEvent(&ev);
        }
***************
*** 271,280 ****
            kiv = _ctrl->maxVal();
          kiv += _ctrl->bias();
!         MidiPlayEvent ev(song->cpos(), outport, chan, ME_CONTROLLER, _dnum, kiv);
          audio->msgPlayMidiEvent(&ev);
        }
        else
        {
!         MidiPlayEvent ev(song->cpos(), outport, chan, ME_CONTROLLER, _dnum, lastv);
          audio->msgPlayMidiEvent(&ev);
        }
--- 274,285 ----
            kiv = _ctrl->maxVal();
          kiv += _ctrl->bias();
!         //MidiPlayEvent ev(song->cpos(), outport, chan, ME_CONTROLLER, _dnum, kiv);
!         MidiPlayEvent ev(0, outport, chan, ME_CONTROLLER, _dnum, kiv);
          audio->msgPlayMidiEvent(&ev);
        }
        else
        {
!         //MidiPlayEvent ev(song->cpos(), outport, chan, ME_CONTROLLER, _dnum, lastv);
!         MidiPlayEvent ev(0, outport, chan, ME_CONTROLLER, _dnum, lastv);
          audio->msgPlayMidiEvent(&ev);
        }
***************
*** 327,331 ****
          else
            ival |= (curval & 0xffff00);  
!         MidiPlayEvent ev(song->cpos(), outport, chan, ME_CONTROLLER, _dnum, ival);
          audio->msgPlayMidiEvent(&ev);
        }
--- 332,337 ----
          else
            ival |= (curval & 0xffff00);  
!         //MidiPlayEvent ev(song->cpos(), outport, chan, ME_CONTROLLER, _dnum, ival);
!         MidiPlayEvent ev(0, outport, chan, ME_CONTROLLER, _dnum, ival);
          audio->msgPlayMidiEvent(&ev);
        }
***************
*** 343,347 ****
          ival += _ctrl->bias();
        
!         MidiPlayEvent ev(song->cpos(), outport, chan, ME_CONTROLLER, _dnum, ival);
          audio->msgPlayMidiEvent(&ev);
        }
--- 349,354 ----
          ival += _ctrl->bias();
        
!         //MidiPlayEvent ev(song->cpos(), outport, chan, ME_CONTROLLER, _dnum, ival);
!         MidiPlayEvent ev(0, outport, chan, ME_CONTROLLER, _dnum, ival);
          audio->msgPlayMidiEvent(&ev);
        }