X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_strip.cc;h=8ab7454ab8846e519714b2095955d14864bae692;hb=ae6dbb836cc1ab1bcbc21883f282361c43f10883;hp=a0e3f2e25b1ba6a3b08a87f06ccdbde1a50d6f82;hpb=17bfb7cad584bf985222d3d380e5e5e06c27aff2;p=ardour.git

diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index a0e3f2e25b..8ab7454ab8 100644
--- 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 ();
@@ -1530,6 +1530,12 @@ MixerStrip::on_key_press_event (GdkEventKey* ev)
 		}
 		return true;
 		break;
+
+	case GDK_0:
+		if (_route) {
+			_route->set_gain (1.0, this);
+		}
+		return true;
 		
 	default:
 		break;
@@ -1580,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 ();