remove newly unused code

diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h
index d59c1e061075a3acfd7180021ab629b99c5427cc..915618037f7bffec14e464f921c7964b9a7db12e 100644 (file)
--- a/libs/ardour/ardour/route.h
+++ b/libs/ardour/ardour/route.h
@@ -160,7 +160,6 @@ class LIBARDOUR_API Route : public SessionObject, public Automatable, public Rou
 
        void set_solo (bool yn, void *src);
        bool soloed () const { return self_soloed () || soloed_by_others (); }
-       void cancel_solo_after_disconnect (bool upstream);
 
        bool soloed_by_others () const { return _soloed_by_others_upstream||_soloed_by_others_downstream; }
        bool soloed_by_others_upstream () const { return _soloed_by_others_upstream; }

diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 3d280be0165c0c2da82a65452b95d2de492376f5..c627998913c9bffc3b6a58e3c2b2f36508a9d461 100644 (file)
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -737,7 +737,6 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop
 
        void set_solo (boost::shared_ptr<RouteList>, bool, SessionEvent::RTeventCallback after = rt_cleanup, bool group_override = false);
        void set_just_one_solo (boost::shared_ptr<Route>, bool, SessionEvent::RTeventCallback after = rt_cleanup);
-       void cancel_solo_after_disconnect (boost::shared_ptr<Route>, bool upstream, SessionEvent::RTeventCallback after = rt_cleanup);
        void set_mute (boost::shared_ptr<RouteList>, bool, SessionEvent::RTeventCallback after = rt_cleanup, bool group_override = false);
        void set_listen (boost::shared_ptr<RouteList>, bool, SessionEvent::RTeventCallback after = rt_cleanup, bool group_override = false);
        void set_record_enabled (boost::shared_ptr<RouteList>, bool, SessionEvent::RTeventCallback after = rt_cleanup, bool group_override = false);
@@ -1774,7 +1773,6 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop
                return ev;
        }
 
-       void rt_cancel_solo_after_disconnect (boost::shared_ptr<RouteList>, bool upstream, bool /* ignored*/ );
        void rt_set_solo (boost::shared_ptr<RouteList>, bool yn, bool group_override);
        void rt_set_just_one_solo (boost::shared_ptr<RouteList>, bool yn, bool /* ignored*/ );
        void rt_set_mute (boost::shared_ptr<RouteList>, bool yn, bool group_override);

diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index 89fd1d35dbf5b749868d063de40533810db5cdec..3c2027007a7dd2d915f7b841e7f392cdd7855bf9 100644 (file)
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -3396,19 +3396,6 @@ Route::output_change_handler (IOChange change, void * /*src*/)
        }
 }
 
-void
-Route::cancel_solo_after_disconnect (bool upstream)
-{
-       assert (0); // no longer used -- TODO remove cruft
-       if (upstream) {
-               _soloed_by_others_upstream = 0;
-       } else {
-               _soloed_by_others_downstream = 0;
-       }
-       set_mute_master_solo ();
-       solo_changed (false, this);
-}
-
 uint32_t
 Route::pans_required () const
 {

diff --git a/libs/ardour/session_rtevents.cc b/libs/ardour/session_rtevents.cc
index 745212abb4151dee946ed9f1a8f5f2ea69879c09..189385e2ee8281fb55c0cd637c61a7b772b6e8f7 100644 (file)
--- a/libs/ardour/session_rtevents.cc
+++ b/libs/ardour/session_rtevents.cc
@@ -75,26 +75,6 @@ Session::rt_set_solo (boost::shared_ptr<RouteList> rl, bool yn, bool /* group_ov
         */
 }
 
-void
-Session::cancel_solo_after_disconnect (boost::shared_ptr<Route> r, bool upstream, SessionEvent::RTeventCallback after)
-{
-       boost::shared_ptr<RouteList> rl (new RouteList);
-       rl->push_back (r);
-
-       queue_event (get_rt_event (rl, upstream, after, false, &Session::rt_cancel_solo_after_disconnect));
-}
-
-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_auditioner()) {
-                       (*i)->cancel_solo_after_disconnect (upstream);
-               }
-       }
-       /* no need to call set-dirty - the disconnect will already have done that */
-}
-
 void
 Session::set_just_one_solo (boost::shared_ptr<Route> r, bool yn, SessionEvent::RTeventCallback after)
 {