diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-12-08 18:16:12 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-12-08 18:16:12 +0000 |
| commit | 42db44c1939410aab15eb3c0d08f6026fb58b003 (patch) | |
| tree | f609009ae5823ae34100c272cb873a35ac8086ba /libs/ardour/ardour | |
| parent | 752d8d4b6f2f28fdd3fc810cfd956e4bec5b9ef8 (diff) | |
merge 3870-3890 from 2.0-ongoing into 3.X (compiles, runs, no other promises
git-svn-id: svn://localhost/ardour2/branches/3.0@4303 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/route.h | 4 | ||||
| -rw-r--r-- | libs/ardour/ardour/session.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h index fb98cb57a7..f963d3b2cf 100644 --- a/libs/ardour/ardour/route.h +++ b/libs/ardour/ardour/route.h @@ -256,8 +256,8 @@ class Route : public IO uint32_t remote_control_id () const; sigc::signal<void> RemoteControlIDChanged; - void sync_order_keys (); - static sigc::signal<void> SyncOrderKeys; + void sync_order_keys (const char* base); + static sigc::signal<void,const char*> SyncOrderKeys; protected: friend class Session; diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index a5245b73f8..017a78a015 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -319,6 +319,8 @@ class Session : public PBD::StatefulDestructible struct RoutePublicOrderSorter { bool operator() (boost::shared_ptr<Route>, boost::shared_ptr<Route> b); }; + + void sync_order_keys (const char* base); 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>)); @@ -1395,8 +1397,6 @@ class Session : public PBD::StatefulDestructible void change_midi_ports (); int use_config_midi_ports (); - mutable gint butler_active; - void set_play_loop (bool yn); void overwrite_some_buffers (Diskstream*); void flush_all_inserts (); |