smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-05 05:05:43 +01:00
Code Issues Projects Releases Wiki Activity

[Summary] Changed function name update_route_active_state() on update_route_record_state()

Browse source 
[Reviewed] GZharun
This commit is contained in:
nikolay 2014-09-19 16:45:01 +03:00
parent e263f8a080
commit cd3e9c230a
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libs/ardour/ardour/session.h
View file

@ -1615,7 +1615,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop
mutable bool have_looped; ///< Used in ::audible_frame(*)
void update_route_active_state ();
void update_route_record_state ();
gint _have_rec_enabled_track;
gint _have_rec_disabled_track;

10
libs/ardour/session.cc
View file

@ -2774,7 +2774,7 @@ Session::add_routes (RouteList& new_routes, bool input_auto_connect, bool output
reassign_track_numbers();
update_route_active_state ();
update_route_record_state ();
RouteAdded (new_routes); /* EMIT SIGNAL */
}
@ -2842,7 +2842,7 @@ Session::add_routes_inner (RouteList& new_routes, bool input_auto_connect, bool
tr->PlaylistChanged.connect_same_thread (*this, boost::bind (&Session::track_playlist_changed, this, boost::weak_ptr<Track> (tr)));
track_playlist_changed (boost::weak_ptr<Track> (tr));
tr->RecordEnableChanged.connect_same_thread (*this, boost::bind (&Session::update_route_active_state, this));
tr->RecordEnableChanged.connect_same_thread (*this, boost::bind (&Session::update_route_record_state, this));
boost::shared_ptr<MidiTrack> mt = boost::dynamic_pointer_cast<MidiTrack> (tr);
if (mt) {
@ -3213,7 +3213,7 @@ Session::remove_route (boost::shared_ptr<Route> route)
}
reassign_track_numbers();
update_route_active_state ();
update_route_record_state ();
}
void
@ -5173,7 +5173,7 @@ Session::have_rec_disabled_track () const
/** Update the state of our rec-enabled tracks flag */
void
Session::update_route_active_state ()
Session::update_route_record_state ()
{
boost::shared_ptr<RouteList> rl = routes.reader ();
RouteList::iterator i = rl->begin();
@ -5250,7 +5250,7 @@ Session::route_added_to_route_group (RouteGroup* rg, boost::weak_ptr<Route> r)
void
Session::route_removed_from_route_group (RouteGroup* rg, boost::weak_ptr<Route> r)
{
update_route_active_state ();
update_route_record_state ();
RouteRemovedFromRouteGroup (rg, r); /* EMIT SIGNAL */
}

2
libs/ardour/session_state.cc
View file

@ -1361,7 +1361,7 @@ Session::set_state (const XMLNode& node, int version)
ControlProtocolManager::instance().set_state (*child, version);
}
update_route_active_state ();
update_route_record_state ();
/* here beginneth the second phase ... */