fix inline display when cairo_surface_has_snapshots

[ardour.git] / gtk2_ardour / mixer_actor.cc

diff --git a/gtk2_ardour/mixer_actor.cc b/gtk2_ardour/mixer_actor.cc
index 6b106c0d8db944ca65c3515ab492fb0405db9944..41b2c87f5fd98e97752fa6ad0ecd96a1f96c28d0 100644 (file)
--- a/gtk2_ardour/mixer_actor.cc
+++ b/gtk2_ardour/mixer_actor.cc
@@ -44,6 +44,7 @@ using namespace PBD;
 using Gtkmm2ext::Bindings;
 
 MixerActor::MixerActor ()
+       : myactions (X_("mixer"))
 {
        register_actions ();
        load_bindings ();
@@ -78,14 +79,14 @@ MixerActor::register_actions ()
        myactions.register_action (group, "scroll-left", _("Scroll Mixer Window to the left"), sigc::mem_fun (*this, &MixerActor::scroll_left));
        myactions.register_action (group, "scroll-right", _("Scroll Mixer Window to the left"), sigc::mem_fun (*this, &MixerActor::scroll_right));
 
-       myactions.register_action (group, "toggle-midi-input-active", _("Toggle MIDI Input Active for Mixer-Selected Tracks/Busses"), 
+       myactions.register_action (group, "toggle-midi-input-active", _("Toggle MIDI Input Active for Mixer-Selected Tracks/Busses"),
                                   sigc::bind (sigc::mem_fun (*this, &MixerActor::toggle_midi_input_active), false));
 }
 
 void
 MixerActor::load_bindings ()
 {
-       bindings = Bindings::get_bindings (X_("mixer"), myactions);
+       bindings = Bindings::get_bindings (X_("Mixer"), myactions);
 }
 
 void
@@ -171,7 +172,7 @@ printf("setting gain to unity (?)");
        BOOST_FOREACH(RouteUI* r, _route_targets) {
                boost::shared_ptr<Route> rp = r->route();
                if (rp) {
-                       rp->set_gain (1.0, Controllable::NoGroup);
+                       rp->gain_control()->set_value (1.0, Controllable::NoGroup);
                }
        }
 }
@@ -249,3 +250,32 @@ MixerActor::ab_plugins ()
        }
 }
 
+void
+MixerActor::vca_assign (boost::shared_ptr<VCA> vca)
+{
+       set_route_targets_for_operation ();
+#if 0
+       BOOST_FOREACH(RouteUI* r, _route_targets) {
+               MixerStrip* ms = dynamic_cast<MixerStrip*> (r);
+               if (ms) {
+                       ms->vca_assign (vca);
+               }
+       }
+#endif
+}
+
+void
+MixerActor::vca_unassign (boost::shared_ptr<VCA> vca)
+{
+       set_route_targets_for_operation ();
+#if 0
+       BOOST_FOREACH(RouteUI* r, _route_targets) {
+               MixerStrip* ms = dynamic_cast<MixerStrip*> (r);
+               if (ms) {
+                       ms->vca_unassign (vca);
+               }
+       }
+#endif
+}
+
+