diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2015-05-08 16:04:15 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-06-29 14:18:11 -0400 |
commit | 11e371c5e7dc90a3814d0425f033db19d8522c59 (patch) | |
tree | 2b5a92c327809db4bf290f42717fafd7874ec3c2 /libs/ardour/ardour/session.h | |
parent | e7fa40762c69762a1fb7b77c7a3d83da6fd7ff72 (diff) |
integrate Session::remove_routes() from Tracks and replace Session::remove_route() internal implementation.
The singular case replicated (and was the model for) the plural case.
Diffstat (limited to 'libs/ardour/ardour/session.h')
-rw-r--r-- | libs/ardour/ardour/session.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index b48b326a60..df4fb0dcb2 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -177,8 +177,12 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop void set_deletion_in_progress (); void clear_deletion_in_progress (); bool deletion_in_progress() const { return _state_of_the_state & Deletion; } + bool routes_deletion_in_progress() const { return _route_deletion_in_progress; } + PBD::Signal0<void> DirtyChanged; + PBD::Signal1<void, bool> RouteAddedOrRemoved; + const SessionDirectory& session_directory () const { return *(_session_dir.get()); } static PBD::Signal1<void,std::string> Dialog; @@ -540,9 +544,11 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop RouteGroup* route_group = 0, uint32_t how_many = 1, std::string name_template = "" ); - void remove_route (boost::shared_ptr<Route>); - void resort_routes (); - void resort_routes_using (boost::shared_ptr<RouteList>); + void remove_routes (boost::shared_ptr<RouteList>); + void remove_route (boost::shared_ptr<Route>); + + void resort_routes (); + void resort_routes_using (boost::shared_ptr<RouteList>); AudioEngine & engine() { return _engine; } AudioEngine const & engine () const { return _engine; } @@ -1443,6 +1449,8 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop void add_routes (RouteList&, bool input_auto_connect, bool output_auto_connect, bool save); void add_routes_inner (RouteList&, bool input_auto_connect, bool output_auto_connect); bool _adding_routes_in_progress; + bool _route_deletion_in_progress; + uint32_t destructive_index; boost::shared_ptr<Route> XMLRouteFactory (const XMLNode&, int); |