[Lmuse-cvs-traffic] muse/muse midiseq.cpp,1.30.2.6,1.30.2.7 midiseq.h,1.6.2.3,1.6.2.4

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

Update of /cvsroot/lmuse/muse/muse
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7548/muse

Modified Files:
      Tag: REL07
	midiseq.cpp midiseq.h 
Log Message:
Latest midi clock slave improvements

Index: midiseq.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/midiseq.cpp,v
retrieving revision 1.30.2.6
retrieving revision 1.30.2.7
diff -C2 -d -r1.30.2.6 -r1.30.2.7
*** midiseq.cpp	17 Jan 2005 21:44:24 -0000	1.30.2.6
--- midiseq.cpp	18 Feb 2005 21:31:47 -0000	1.30.2.7
***************
*** 188,192 ****
        mclock2 = 0.0;
        songtick1 = songtick2 = 0;
!       lastTempo = syncTempo = 0;
        }
  
--- 188,193 ----
        mclock2 = 0.0;
        songtick1 = songtick2 = 0;
!       lastTempo = 0;
!       storedtimediffs = 0;
        }
  

Index: midiseq.h
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/midiseq.h,v
retrieving revision 1.6.2.3
retrieving revision 1.6.2.4
diff -C2 -d -r1.6.2.3 -r1.6.2.4
*** midiseq.h	17 Jan 2005 21:44:39 -0000	1.6.2.3
--- midiseq.h	18 Feb 2005 21:31:47 -0000	1.6.2.4
***************
*** 39,45 ****
        unsigned _midiTick;
        double mclock1, mclock2;
!       int songtick1, songtick2;
        int recTick1, recTick2;
!       int syncTempo, lastTempo;
  /* Testing */
  
--- 39,47 ----
        unsigned _midiTick;
        double mclock1, mclock2;
!       double songtick1, songtick2;
        int recTick1, recTick2;
!       int lastTempo;
!       double timediff[24];
!       int storedtimediffs;
  /* Testing */
  
***************
*** 71,75 ****
        // void eventReceived(MidiRecordEvent& event);
        void mmcInput(const unsigned char* p, int n);
-       int getSyncTempo() { return syncTempo; }
  
        void msgMsg(int id);
--- 73,76 ----