diff options
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/session.h | 16 | ||||
| -rw-r--r-- | libs/ardour/ardour/session_event.h | 11 |
2 files changed, 9 insertions, 18 deletions
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index 18af14a313..ed34c387e8 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -303,6 +303,8 @@ class Session : public PBD::StatefulDestructible, public SessionEventManager, pu sigc::signal<void,RouteList&> RouteAdded; sigc::signal<void> RouteGroupChanged; + void queue_event (SessionEvent*); + void request_roll_at_and_return (nframes_t start, nframes_t return_to); void request_bounded_roll (nframes_t start, nframes_t end); void request_stop (bool abort = false, bool clear_state = false); @@ -330,12 +332,6 @@ class Session : public PBD::StatefulDestructible, public SessionEventManager, pu int remove_region_from_region_list (boost::shared_ptr<Region>); - /* ask the session to do realtime things, in RT context, then get back to us via a callback (which must be - cross-thread or RT safe, since it too is called from RT context) - */ - - void request_real_time_operation (sigc::slot<void> rt_op, sigc::slot<void,SessionEvent*> callback); - nframes_t get_maximum_extent () const; nframes_t current_end_frame() const { return end_location->start(); } nframes_t current_start_frame() const { return start_location->start(); } @@ -626,9 +622,8 @@ class Session : public PBD::StatefulDestructible, public SessionEventManager, pu sigc::signal<void,bool> SoloActive; sigc::signal<void> SoloChanged; - - void record_disenable_all (sigc::slot<void,SessionEvent*>); - void record_enable_all (sigc::slot<void,SessionEvent*>); + + void set_all_record_enable (boost::shared_ptr<RouteList>, bool); /* control/master out */ @@ -1188,7 +1183,6 @@ class Session : public PBD::StatefulDestructible, public SessionEventManager, pu /* SessionEventManager interface */ - void queue_event (SessionEvent*); void process_event (SessionEvent*); void set_next_event (); void cleanup_event (SessionEvent*,int); @@ -1475,8 +1469,6 @@ class Session : public PBD::StatefulDestructible, public SessionEventManager, pu void jack_timebase_callback (jack_transport_state_t, nframes_t, jack_position_t*, int); int jack_sync_callback (jack_transport_state_t, jack_position_t*); void reset_jack_connection (jack_client_t* jack); - void record_enable_change_all (bool yn, sigc::slot<void,SessionEvent*>); - void do_record_enable_change_all (RouteList*, bool); void process_rtop (SessionEvent*); XMLNode& state(bool); diff --git a/libs/ardour/ardour/session_event.h b/libs/ardour/ardour/session_event.h index a903e3cd4f..7775f4b1ad 100644 --- a/libs/ardour/ardour/session_event.h +++ b/libs/ardour/ardour/session_event.h @@ -32,7 +32,6 @@ struct SessionEvent { Audition, InputConfigurationChange, SetPlayAudioRange, - SetRecordEnable, RealTimeOperation, /* only one of each of these events can be queued at any one time */ @@ -64,9 +63,9 @@ struct SessionEvent { union { bool second_yes_or_no; - RouteList* routes; }; + boost::shared_ptr<RouteList> routes; sigc::slot<void> rt_slot; /* what to call in RT context */ sigc::slot<void,SessionEvent*> rt_return; /* called after rt_slot, with this event as an argument */ @@ -118,10 +117,8 @@ class SessionEventManager { SessionEventManager () : pending_events (2048){} virtual ~SessionEventManager() {} - void add_event (nframes64_t action_frame, SessionEvent::Type type, nframes64_t target_frame = 0); - void remove_event (nframes64_t frame, SessionEvent::Type type); + virtual void queue_event (SessionEvent *ev) = 0; void clear_events (SessionEvent::Type type); - protected: RingBuffer<SessionEvent*> pending_events; @@ -143,8 +140,10 @@ class SessionEventManager { 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); + virtual void process_event(SessionEvent*) = 0; - virtual void queue_event (SessionEvent *ev) = 0; virtual void set_next_event () = 0; }; |