use FileSource::within_session() for peak-files

[ardour.git] / libs / ardour / session_rtevents.cc

diff --git a/libs/ardour/session_rtevents.cc b/libs/ardour/session_rtevents.cc
index 2b52b3b28a04c04866cf7c016dde0c0438fb6e77..b00c4c1ebf79c484c01bc099ee4d68eafd1e02f0 100644 (file)
--- a/libs/ardour/session_rtevents.cc
+++ b/libs/ardour/session_rtevents.cc
@@ -42,7 +42,7 @@ void
 Session::rt_set_monitoring (boost::shared_ptr<RouteList> rl, MonitorChoice mc, bool /* group_override */)
 {
        for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
-               if (!(*i)->is_hidden()) {
+               if (!(*i)->is_auditioner()) {
                        boost::shared_ptr<Track> t = boost::dynamic_pointer_cast<Track> (*i);
                        if (t) {
                                t->set_monitoring (mc);
@@ -62,12 +62,17 @@ Session::set_solo (boost::shared_ptr<RouteList> rl, bool yn, SessionEvent::RTeve
 void
 Session::rt_set_solo (boost::shared_ptr<RouteList> rl, bool yn, bool /* group_override */)
 {
+       solo_update_disabled = true;
+       
        for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
-               if (!(*i)->is_hidden()) {
+               if (!(*i)->is_auditioner()) {
                        (*i)->set_solo (yn, this);
                }
        }
 
+       solo_update_disabled = false;
+       routes_solo_changed (rl);
+
        set_dirty();
 }
 
@@ -84,7 +89,7 @@ void
 Session::rt_cancel_solo_after_disconnect (boost::shared_ptr<RouteList> rl, bool upstream, bool /* group_override */)
 {
        for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
-               if (!(*i)->is_hidden()) {
+               if (!(*i)->is_auditioner()) {
                        (*i)->cancel_solo_after_disconnect (upstream);
                }
        }
@@ -112,7 +117,7 @@ Session::rt_set_just_one_solo (boost::shared_ptr<RouteList> just_one, bool yn, b
        boost::shared_ptr<Route> r = just_one->front();
 
        for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
-               if (!(*i)->is_hidden() && r != *i) {
+               if (!(*i)->is_auditioner() && r != *i) {
                        (*i)->set_solo (!yn, (*i)->route_group());
                }
        }
@@ -132,7 +137,7 @@ void
 Session::rt_set_listen (boost::shared_ptr<RouteList> rl, bool yn, bool /*group_override*/ )
 {
        for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
-               if (!(*i)->is_hidden()) {
+               if (!(*i)->is_auditioner()) {
                        (*i)->set_listen (yn, this);
                }
        }
@@ -143,6 +148,12 @@ Session::rt_set_listen (boost::shared_ptr<RouteList> rl, bool yn, bool /*group_o
 void
 Session::set_mute (boost::shared_ptr<RouteList> rl, bool yn, SessionEvent::RTeventCallback after, bool group_override)
 {
+       /* Set superficial value of mute controls for automation. */
+       for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
+               boost::shared_ptr<Route::MuteControllable> mc = (*i)->mute_control();
+               mc->set_superficial_value(yn);
+       }
+
        queue_event (get_rt_event (rl, yn, after, group_override, &Session::rt_set_mute));
 }
 
@@ -150,7 +161,7 @@ void
 Session::rt_set_mute (boost::shared_ptr<RouteList> rl, bool yn, bool /*group_override*/)
 {
        for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
-               if (!(*i)->is_monitor() && !(*i)->is_hidden()) {
+               if (!(*i)->is_monitor() && !(*i)->is_auditioner()) {
                        (*i)->set_mute (yn, this);
                }
        }
@@ -168,7 +179,7 @@ void
 Session::rt_set_solo_isolated (boost::shared_ptr<RouteList> rl, bool yn, bool /*group_override*/)
 {
        for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
-               if (!(*i)->is_master() && !(*i)->is_monitor() && !(*i)->is_hidden()) {
+               if (!(*i)->is_master() && !(*i)->is_monitor() && !(*i)->is_auditioner()) {
                        (*i)->set_solo_isolated (yn, this);
                }
        }
@@ -191,7 +202,7 @@ Session::set_record_enabled (boost::shared_ptr<RouteList> rl, bool yn, SessionEv
         */
 
        for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
-               if ((*i)->is_hidden()) {
+               if ((*i)->is_auditioner() || (*i)->record_safe ()) {
                        continue;
                }
 
@@ -209,7 +220,7 @@ void
 Session::rt_set_record_enabled (boost::shared_ptr<RouteList> rl, bool yn, bool group_override)
 {
        for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
-               if ((*i)->is_hidden()) {
+               if ((*i)->is_auditioner() || (*i)->record_safe ()) {
                        continue;
                }
 
@@ -223,6 +234,32 @@ Session::rt_set_record_enabled (boost::shared_ptr<RouteList> rl, bool yn, bool g
        set_dirty ();
 }
 
+
+void
+Session::set_record_safe (boost::shared_ptr<RouteList> rl, bool yn, SessionEvent::RTeventCallback after, bool group_override)
+{
+       set_record_enabled (rl, false, after, group_override);
+       queue_event (get_rt_event (rl, yn, after, group_override, &Session::rt_set_record_safe));
+}
+
+void
+Session::rt_set_record_safe (boost::shared_ptr<RouteList> rl, bool yn, bool group_override)
+{
+       for (RouteList::iterator i = rl->begin (); i != rl->end (); ++i) {
+               if ((*i)->is_auditioner ()) { // REQUIRES REVIEW Can audiotioner be in Record Safe mode?
+                       continue;
+               }
+           
+               boost::shared_ptr<Track> t;
+           
+               if ((t = boost::dynamic_pointer_cast<Track>(*i)) != 0) {
+                       t->set_record_safe (yn, (group_override ? (void*) t->route_group () : (void *) this));
+               }
+       }
+       
+       set_dirty ();
+}
+
 void
 Session::process_rtop (SessionEvent* ev)
 {