diff options
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/route.h | 18 | ||||
| -rw-r--r-- | libs/ardour/ardour/session.h | 5 | ||||
| -rw-r--r-- | libs/ardour/ardour/types.h | 6 |
3 files changed, 16 insertions, 13 deletions
diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h index d1248d8b03..a15937377e 100644 --- a/libs/ardour/ardour/route.h +++ b/libs/ardour/ardour/route.h @@ -101,8 +101,8 @@ class Route : public SessionObject, public Automatable, public RouteGroupMember, bool set_name (const std::string& str); static void set_name_in_state (XMLNode &, const std::string &); - int32_t order_key (std::string const &) const; - void set_order_key (std::string const &, int32_t); + int32_t order_key (RouteSortOrderKey) const; + void set_order_key (RouteSortOrderKey, int32_t); bool is_hidden() const { return _flags & Hidden; } bool is_master() const { return _flags & MasterOut; } @@ -420,19 +420,19 @@ class Route : public SessionObject, public Automatable, public RouteGroupMember, MonitorBusRemoteControlID = 319, }; - void set_remote_control_id (uint32_t id, bool notify_class_listeners = true); + void set_remote_control_id (uint32_t id, bool notify_class_listeners = true); uint32_t remote_control_id () const; /* for things concerned about *this* route's RID */ PBD::Signal0<void> RemoteControlIDChanged; - /* for things concerned about any route's RID changes */ + /* for things concerned about *any* route's RID changes */ static PBD::Signal0<void> RemoteControlIDChange; - void sync_order_keys (std::string const &); - static PBD::Signal1<void,std::string const &> SyncOrderKeys; + void sync_order_keys (RouteSortOrderKey); + static PBD::Signal1<void,RouteSortOrderKey> SyncOrderKeys; bool has_external_redirects() const; @@ -518,7 +518,6 @@ class Route : public SessionObject, public Automatable, public RouteGroupMember, void silence_unlocked (framecnt_t); ChanCount processor_max_streams; - uint32_t _remote_control_id; uint32_t pans_required() const; ChanCount n_process_buffers (); @@ -534,8 +533,9 @@ class Route : public SessionObject, public Automatable, public RouteGroupMember, static uint32_t order_key_cnt; - typedef std::map<std::string, long> OrderKeys; - OrderKeys order_keys; + typedef std::map<RouteSortOrderKey,int32_t> OrderKeys; + OrderKeys order_keys; + uint32_t* _remote_control_id; void input_change_handler (IOChange, void *src); void output_change_handler (IOChange, void *src); diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index 7f73d3ae77..eb84c0685e 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -235,7 +235,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi bool operator() (boost::shared_ptr<Route>, boost::shared_ptr<Route> b); }; - void sync_order_keys (std::string const &); + void sync_order_keys (RouteSortOrderKey); template<class T> void foreach_route (T *obj, void (T::*func)(Route&)); template<class T> void foreach_route (T *obj, void (T::*func)(boost::shared_ptr<Route>)); @@ -464,8 +464,6 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi void resort_routes (); void resort_routes_using (boost::shared_ptr<RouteList>); - void set_remote_control_ids(); - AudioEngine & engine() { return _engine; } AudioEngine const & engine () const { return _engine; } @@ -1488,7 +1486,6 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi XMLNode& get_control_protocol_state (); void set_history_depth (uint32_t depth); - void sync_order_keys (); static bool _disable_all_loaded_plugins; diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h index 6d05bdbbd8..713e35ebab 100644 --- a/libs/ardour/ardour/types.h +++ b/libs/ardour/ardour/types.h @@ -351,6 +351,12 @@ namespace ARDOUR { PostFader }; + enum RouteSortOrderKey { + UndefinedSort, + EditorSort, + MixerSort + }; + enum MonitorModel { HardwareMonitoring, ///< JACK does monitoring SoftwareMonitoring, ///< Ardour does monitoring |