diff options
| -rw-r--r-- | gtk2_ardour/region_gain_line.cc | 19 | ||||
| -rw-r--r-- | gtk2_ardour/region_gain_line.h | 4 |
2 files changed, 4 insertions, 19 deletions
diff --git a/gtk2_ardour/region_gain_line.cc b/gtk2_ardour/region_gain_line.cc index 6299813121..9b2ff346dd 100644 --- a/gtk2_ardour/region_gain_line.cc +++ b/gtk2_ardour/region_gain_line.cc @@ -43,26 +43,15 @@ AudioRegionGainLine::AudioRegionGainLine (const string & name, Session& s, Audio session (s), rv (r) { + // If this isn't true something is horribly wrong, and we'll get catastrophic gain values + assert(l->parameter().type() == EnvelopeAutomation); + group->raise_to_top (); set_verbose_cursor_uses_gain_mapping (true); terminal_points_can_slide = false; } void -AudioRegionGainLine::view_to_model_y (double& y) -{ - y = slider_position_to_gain (y); - y = max (0.0, y); - y = min (2.0, y); -} - -void -AudioRegionGainLine::model_to_view_y (double& y) -{ - y = gain_to_slider_position (y); -} - -void AudioRegionGainLine::start_drag (ControlPoint* cp, nframes_t x, float fraction) { AutomationLine::start_drag (cp, x, fraction); @@ -102,7 +91,7 @@ AudioRegionGainLine::end_drag (ControlPoint* cp) { if (!rv.audio_region()->envelope_active()) { rv.audio_region()->set_envelope_active(true); - trackview.session().add_command(new MementoCommand<AudioRegion>(*(rv.audio_region().get()), 0, &rv.audio_region()->get_state())); + trackview.session().add_command(new MementoCommand<AudioRegion>(*(rv.audio_region().get()), 0, &rv.audio_region()->get_state())); } AutomationLine::end_drag(cp); diff --git a/gtk2_ardour/region_gain_line.h b/gtk2_ardour/region_gain_line.h index fe03c0f76f..af23fa37f3 100644 --- a/gtk2_ardour/region_gain_line.h +++ b/gtk2_ardour/region_gain_line.h @@ -37,15 +37,11 @@ class AudioRegionGainLine : public AutomationLine public: AudioRegionGainLine (const string & name, ARDOUR::Session&, AudioRegionView&, ArdourCanvas::Group& parent, boost::shared_ptr<ARDOUR::AutomationList>); - void view_to_model_y (double&); - void model_to_view_y (double&); - void start_drag (ControlPoint*, nframes_t x, float fraction); void end_drag (ControlPoint*); void remove_point (ControlPoint&); - private: ARDOUR::Session& session; AudioRegionView& rv; |