ardour/livetrax
13
0
Fork 0
Code

Re-fix #3685 having read the request properly.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@8502 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-01-11 01:30:37 +00:00
parent afc0e2db6c
commit af94fd9971
4 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtk2_ardour/gain_meter.cc
View File

@ -598,9 +598,6 @@ GainMeterBase::gain_slider_button_press (GdkEventButton* ev)
case GDK_BUTTON_PRESS: case GDK_BUTTON_PRESS:
_amp->gain_control()->start_touch (_amp->session().transport_frame()); _amp->gain_control()->start_touch (_amp->session().transport_frame());
break; break;
case GDK_2BUTTON_PRESS:
SliderDoubleClicked (); /* EMIT SIGNAL */
break;
default: default:
return false; return false;
} }

3
gtk2_ardour/gain_meter.h
View File

@ -170,9 +170,6 @@ class GainMeterBase : virtual public sigc::trackable, ARDOUR::SessionHandlePtr
void reset_peak_display (); void reset_peak_display ();
void reset_group_peak_display (ARDOUR::RouteGroup*); 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> ResetAllPeakDisplays;
static sigc::signal<void,ARDOUR::RouteGroup*> ResetGroupPeakDisplays; static sigc::signal<void,ARDOUR::RouteGroup*> ResetGroupPeakDisplays;

3
gtk2_ardour/mixer_strip.cc
View File

@ -306,9 +306,6 @@ MixerStrip::init ()
input_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::input_press), false); 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); 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 /* we don't need this if its not an audio track, but we don't know that yet and it doesn't
hurt (much). hurt (much).
*/ */

6
gtk2_ardour/processor_box.cc
View File

@ -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()) { if (!_session->engine().connected()) {
return; return;