merged with trunk

1 files changed, 3 insertions, 14 deletions

diff --git a/muse2/muse/midiseq.h b/muse2/muse/midiseq.h
index 3c3813ef..bf7a3376 100644
--- a/muse2/muse/midiseq.h
+++ b/muse2/muse/midiseq.h
@@ -42,7 +42,6 @@ class SynthI;
 //---------------------------------------------------------
 
 class MidiSeq : public Thread {
-      int realRtcTicks;
       int timerFd;
       int idle;
       int prio;   // realtime priority
@@ -52,9 +51,6 @@ class MidiSeq : public Thread {
 /* Testing */
       bool playStateExt;       // used for keeping play state in sync functions
       int recTick;            // ext sync tick position
-//      int lastTickPos;        // position of last sync tick
-      // run values:
-//      unsigned _midiTick;
       double mclock1, mclock2;
       double songtick1, songtick2;
       int recTick1, recTick2;
@@ -68,7 +64,7 @@ class MidiSeq : public Thread {
       Timer *timer;
 
       signed int selectTimer();
-      bool setRtcTicks();
+      int setRtcTicks();
       static void midiTick(void* p, void*);
       void processTimerTick();
       void processSeek();
@@ -78,16 +74,12 @@ class MidiSeq : public Thread {
       void updatePollFd();
 
       void mtcSyncMsg(const MTC&, int, bool);
-      //void mtcInputFull(const unsigned char* p, int n);
-      //void nonRealtimeSystemSysex(const unsigned char* p, int n);
 
    public:
-      //MidiSeq(int prio, const char* name);
       MidiSeq(const char* name);
       
       ~MidiSeq();
       
-      //bool start();
       virtual void start(int);
       
       virtual void threadStop();
@@ -98,16 +90,13 @@ class MidiSeq : public Thread {
       void realtimeSystemInput(int, int);
       void mtcInputQuarter(int, unsigned char);
       void setSongPosition(int, int);
-      // void eventReceived(MidiRecordEvent& event);
-      //void mmcInput(const unsigned char* p, int n);
       void mmcInput(int, const unsigned char*, int);
       void mtcInputFull(int, const unsigned char*, int);
       void nonRealtimeSystemSysex(int, const unsigned char*, int);
 
       void msgMsg(int id);
-      //void msgProcess();
-      //void msgSeek();
-      //void msgStop();
+      void msgSeek();
+      void msgStop();
       void msgSetRtc();
       void msgUpdatePollFd();
       void msgAddSynthI(SynthI* synth);