diff options
| -rw-r--r-- | gtk2_ardour/gain_meter.cc | 3 | ||||
| -rw-r--r-- | gtk2_ardour/gain_meter.h | 3 | ||||
| -rw-r--r-- | gtk2_ardour/mixer_strip.cc | 3 | ||||
| -rw-r--r-- | gtk2_ardour/processor_box.cc | 6 |
4 files changed, 5 insertions, 10 deletions
diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index 64fde6f6bf..eeac58f5e9 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -598,9 +598,6 @@ GainMeterBase::gain_slider_button_press (GdkEventButton* ev) case GDK_BUTTON_PRESS: _amp->gain_control()->start_touch (_amp->session().transport_frame()); break; - case GDK_2BUTTON_PRESS: - SliderDoubleClicked (); /* EMIT SIGNAL */ - break; default: return false; } diff --git a/gtk2_ardour/gain_meter.h b/gtk2_ardour/gain_meter.h index 8e96c51d9c..83f51ab946 100644 --- a/gtk2_ardour/gain_meter.h +++ b/gtk2_ardour/gain_meter.h @@ -170,9 +170,6 @@ class GainMeterBase : virtual public sigc::trackable, ARDOUR::SessionHandlePtr void reset_peak_display (); void reset_group_peak_display (ARDOUR::RouteGroup*); - /** Emitted when our slider is double-clicked */ - PBD::Signal0<void> SliderDoubleClicked; - static sigc::signal<void> ResetAllPeakDisplays; static sigc::signal<void,ARDOUR::RouteGroup*> ResetGroupPeakDisplays; diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 31098f304f..8c6d612012 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -306,9 +306,6 @@ MixerStrip::init () input_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::input_press), false); output_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::output_press), false); - /* Go back to displaying our route's gain in the slider if it is double-clicked */ - gain_meter().SliderDoubleClicked.connect (*this, invalidator (*this), boost::bind (&MixerStrip::revert_to_default_display, this), gui_context ()); - /* we don't need this if its not an audio track, but we don't know that yet and it doesn't hurt (much). */ diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc index a2c5f61b24..c489bce5be 100644 --- a/gtk2_ardour/processor_box.cc +++ b/gtk2_ardour/processor_box.cc @@ -1634,7 +1634,11 @@ ProcessorBox::toggle_edit_processor (boost::shared_ptr<Processor> processor) } } - if ((internal_send = boost::dynamic_pointer_cast<InternalSend> (processor)) != 0) { + if (boost::dynamic_pointer_cast<Amp> (processor)) { + + _parent_strip->revert_to_default_display (); + + } else if ((internal_send = boost::dynamic_pointer_cast<InternalSend> (processor)) != 0) { if (!_session->engine().connected()) { return; |