Respond to MMC even when synced to JACK. Fixes #3700.

[ardour.git] / libs / ardour / ardour / session_event.h

diff --git a/libs/ardour/ardour/session_event.h b/libs/ardour/ardour/session_event.h
index e2027298fbf397b1e3bdd0edbc6598a6ada0b513..738de46a86af100794e1353072c87db02ed39925 100644 (file)
--- a/libs/ardour/ardour/session_event.h
+++ b/libs/ardour/ardour/session_event.h
@@ -36,6 +36,7 @@ struct SessionEvent {
            RealTimeOperation,
             AdjustPlaybackBuffering,
             AdjustCaptureBuffering,
+           SetTimecodeTransmission,
 
            /* only one of each of these events can be queued at any one time */
            
@@ -52,14 +53,14 @@ struct SessionEvent {
     
     Type             type;
     Action           action;
-    nframes64_t      action_frame;
-    nframes64_t      target_frame;
+    framepos_t      action_frame;
+    framepos_t      target_frame;
     double           speed;
     
     union {
        void*        ptr;
        bool         yes_or_no;
-       nframes64_t  target2_frame;
+       framepos_t  target2_frame;
        Slave*       slave;
        Route*       route;
     };
@@ -82,7 +83,7 @@ struct SessionEvent {
     
     boost::shared_ptr<Region> region;
 
-    SessionEvent (Type t, Action a, nframes_t when, nframes_t where, double spd, bool yn = false, bool yn2 = false)
+    SessionEvent (Type t, Action a, framepos_t when, framepos_t where, double spd, bool yn = false, bool yn2 = false)
            : type (t)
            , action (a)
            , action_frame (when)
@@ -111,7 +112,7 @@ struct SessionEvent {
     void* operator new (size_t);
     void  operator delete (void *ptr, size_t /*size*/);
     
-    static const nframes_t Immediate = 0;
+    static const framepos_t Immediate = 0;
     
     static void create_per_thread_pool (const std::string& n, uint32_t nitems);
     static void init_event_pool ();
@@ -147,13 +148,13 @@ protected:
 
        void dump_events () const;
        void merge_event (SessionEvent*);
-       void replace_event (SessionEvent::Type, nframes64_t action_frame, nframes64_t target = 0);
+       void replace_event (SessionEvent::Type, framepos_t action_frame, framepos_t target = 0);
        bool _replace_event (SessionEvent*);
        bool _remove_event (SessionEvent *);
        void _clear_event_type (SessionEvent::Type);
 
-       void add_event (nframes64_t action_frame, SessionEvent::Type type, nframes64_t target_frame = 0);
-       void remove_event (nframes64_t frame, SessionEvent::Type type);
+       void add_event (framepos_t action_frame, SessionEvent::Type type, framepos_t target_frame = 0);
+       void remove_event (framepos_t frame, SessionEvent::Type type);
 
        virtual void process_event(SessionEvent*) = 0;
        virtual void set_next_event () = 0;