Preserve stacked / overlaid state of tracks in the session file.

[ardour.git] / gtk2_ardour / mixer_strip.cc

diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index b18e1699b26287d4b3498977095c6c5636863b34..8ab7454ab8846e519714b2095955d14864bae692 100644 (file)
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -343,7 +343,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        _current_delivery = _route->main_outs ();
 
        panners.set_panner (rt->main_outs()->panner());
-       gpm.set_controls (rt, rt->shared_peak_meter(), rt->gain_control(), rt->amp());
+       gpm.set_controls (rt, rt->shared_peak_meter(), rt->amp());
        processor_box.set_route (rt);
 
        if (set_color_from_route()) {
@@ -939,14 +939,14 @@ MixerStrip::diskstream_changed ()
 }      
 
 void
-MixerStrip::input_changed (IOChange change, void *src)
+MixerStrip::input_changed (IOChange /*change*/, void */*src*/)
 {
        Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &MixerStrip::update_input_display));
        set_width_enum (_width, this);
 }
 
 void
-MixerStrip::output_changed (IOChange change, void *src)
+MixerStrip::output_changed (IOChange /*change*/, void */*src*/)
 {
        Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &MixerStrip::update_output_display));
        set_width_enum (_width, this);
@@ -1419,12 +1419,12 @@ MixerStrip::switch_io (boost::shared_ptr<Route> target)
                send = boost::dynamic_pointer_cast<Send>(_current_delivery);
                send->set_metering (true);
                _current_delivery->GoingAway.connect (mem_fun (*this, &MixerStrip::revert_to_default_display));
-               gain_meter().set_controls (_route, send->meter(), send->amp()->gain_control(), send->amp());
+               gain_meter().set_controls (_route, send->meter(), send->amp());
                panner_ui().set_panner (_current_delivery->panner());
 
        } else {
                _current_delivery = _route->main_outs ();
-               gain_meter().set_controls (_route, _route->shared_peak_meter(), _route->gain_control(), _route->amp());
+               gain_meter().set_controls (_route, _route->shared_peak_meter(), _route->amp());
                panner_ui().set_panner (_route->main_outs()->panner());
        }
        
@@ -1446,7 +1446,7 @@ MixerStrip::revert_to_default_display ()
        
        _current_delivery = _route->main_outs();
 
-       gain_meter().set_controls (_route, _route->shared_peak_meter(), _route->gain_control(), _route->amp());
+       gain_meter().set_controls (_route, _route->shared_peak_meter(), _route->amp());
        gain_meter().setup_meters ();
        panner_ui().set_panner (_route->main_outs()->panner());
        panner_ui().setup_pan ();
@@ -1586,7 +1586,7 @@ MixerStrip::on_key_release_event (GdkEventKey* ev)
 }
 
 bool
-MixerStrip::on_enter_notify_event (GdkEventCrossing* ev)
+MixerStrip::on_enter_notify_event (GdkEventCrossing*)
 {
        Keyboard::magic_widget_grab_focus ();
        grab_focus ();