RouteUI connects to Route's PropertyChange signal; derived types implement route_prop...

[ardour.git] / gtk2_ardour / mixer_strip.cc

diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 83cb318cd5a6bb95bf33deaa47eee9bffda15e4a..30859c8d5e8472678bf6b3165bbec32c9f89e5b3 100644 (file)
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -84,7 +84,7 @@ MixerStrip* MixerStrip::_entered_mixer_strip;
 PBD::Signal1<void,MixerStrip*> MixerStrip::CatchDeletion;
 
 MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer)
-       : AxisView(sess)
+       : SessionHandlePtr (sess)
        , RouteUI (sess)
        , _mixer(mx)
        , _mixer_owned (in_mixer)
@@ -116,7 +116,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer)
 }
 
 MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr<Route> rt, bool in_mixer)
-       : AxisView(sess)
+       : SessionHandlePtr (sess)
        , RouteUI (sess)
        , _mixer(mx)
        , _mixer_owned (in_mixer)
@@ -450,6 +450,15 @@ MixerStrip::mixer_strip_leave_event (GdkEventCrossing *ev)
        return false;
 }
 
+string
+MixerStrip::name() const
+{
+       if (_route) {
+               return _route->name();
+       }
+       return string();
+}
+
 void
 MixerStrip::set_route (boost::shared_ptr<Route> rt)
 {
@@ -640,7 +649,6 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        }
 
        _route->comment_changed.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::setup_comment_button, this), gui_context());
-       _route->PropertyChanged.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::property_changed, this, _1), gui_context());
 
        _route->gain_control()->MasterStatusChange.connect (route_connections,
                                                            invalidator (*this),
@@ -1528,9 +1536,9 @@ MixerStrip::select_route_group (GdkEventButton *ev)
 
                        PropertyList* plist = new PropertyList();
 
-                       plist->add (Properties::gain, true);
-                       plist->add (Properties::mute, true);
-                       plist->add (Properties::solo, true);
+                       plist->add (Properties::group_gain, true);
+                       plist->add (Properties::group_mute, true);
+                       plist->add (Properties::group_solo, true);
 
                        group_menu = new RouteGroupMenu (_session, plist);
                }
@@ -1741,10 +1749,8 @@ MixerStrip::set_selected (bool yn)
 }
 
 void
-MixerStrip::property_changed (const PropertyChange& what_changed)
+MixerStrip::route_property_changed (const PropertyChange& what_changed)
 {
-       RouteUI::property_changed (what_changed);
-
        if (what_changed.contains (ARDOUR::Properties::name)) {
                name_changed ();
        }
@@ -2616,6 +2622,23 @@ MixerStrip::update_track_number_visibility ()
                number_label.hide ();
        }
 }
+
+bool
+MixerStrip::is_selected () const
+{
+       if (!_route) {
+               return false;
+       }
+
+       return _route->presentation_info().selected();
+}
+
+Gdk::Color
+MixerStrip::color () const
+{
+       return route_color ();
+}
+
 bool
 MixerStrip::marked_for_display () const
 {