merged with trunk

1 files changed, 4 insertions, 9 deletions

diff --git a/muse2/muse/mididev.h b/muse2/muse/mididev.h
index 57c96090..18a58623 100644
--- a/muse2/muse/mididev.h
+++ b/muse2/muse/mididev.h
@@ -28,7 +28,6 @@
 #include <list>
 
 #include "mpevent.h"
-//#include "sync.h"
 #include "route.h"
 #include "globaldefs.h"
 
@@ -37,7 +36,6 @@
 
 namespace MusECore {
 
-//class RouteList;
 class Xml;
 
 //---------------------------------------------------------
@@ -57,9 +55,6 @@ class MidiDevice {
       bool _readEnable;  // set when opened/closed.
       bool _writeEnable; //
       
-      //int _sysexWriteChunk;
-      //int _sysexReadChunk;
-      //bool _sysexWritingChunks;
       bool _sysexReadingChunks;
       
       MPEventList _stuckNotes;
@@ -69,6 +64,9 @@ class MidiDevice {
       MidiFifo eventFifo;  
       // Recording fifos. To speed up processing, one per channel plus one special system 'channel' for channel-less events like sysex.
       MidiRecFifo _recordFifo[MIDI_CHANNELS + 1];   
+
+      volatile bool stopPending;         
+      volatile bool seekPending;
       
       RouteList _inRoutes, _outRoutes;
       
@@ -126,7 +124,7 @@ class MidiDevice {
       virtual bool putEvent(const MidiPlayEvent&);
       // This method will try to putEvent 'tries' times, waiting 'delayUs' microseconds between tries.
       // Since it waits, it should not be used in RT or other time-sensitive threads. p4.0.15
-      bool putEventWithRetry(const MidiPlayEvent&, int /*tries*/ = 2, long /*delayUs*/ = 50000);  // 2 tries, 50 mS by default.
+      bool putEventWithRetry(const MidiPlayEvent&, int tries = 2, long delayUs = 50000);  // 2 tries, 50 mS by default.
       
       virtual void handleStop();  
       virtual void handleSeek();
@@ -140,11 +138,8 @@ class MidiDevice {
       MidiRecFifo& recordEvents(const unsigned int ch) { return _recordFifo[ch]; }
       bool sysexFIFOProcessed()                     { return _sysexFIFOProcessed; }
       void setSysexFIFOProcessed(bool v)            { _sysexFIFOProcessed = v; }
-      //bool sysexWritingChunks() { return _sysexWritingChunks; }
-      //void setSysexWritingChunks(bool v) { _sysexWritingChunks = v; }
       bool sysexReadingChunks() { return _sysexReadingChunks; }
       void setSysexReadingChunks(bool v) { _sysexReadingChunks = v; }
-      //virtual void getEvents(unsigned /*from*/, unsigned /*to*/, int /*channel*/, MPEventList* /*dst*/);
       bool sendNullRPNParams(int, bool);
       };