X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fregion_gain_line.cc;h=8dfbdeeff49edbea1c774102a98605e72d645d99;hb=d3919894449e2f61a1cfa64330b0810c53042f97;hp=5ad4b31186e182d7e15cdb7a4be422a10700ffa2;hpb=183f69970c6c436b102f8b2fbe1bc6070c9e9bfe;p=ardour.git diff --git a/gtk2_ardour/region_gain_line.cc b/gtk2_ardour/region_gain_line.cc index 5ad4b31186..8dfbdeeff4 100644 --- a/gtk2_ardour/region_gain_line.cc +++ b/gtk2_ardour/region_gain_line.cc @@ -1,55 +1,68 @@ -#include -#include +/* + Copyright (C) 2000-2007 Paul Davis + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +#include "evoral/Curve.hpp" +#include "pbd/memento_command.h" +#include "pbd/stateful_diff_command.h" + +#include "ardour/audioregion.h" +#include "ardour/session.h" + +#include "control_point.h" #include "region_gain_line.h" -#include "regionview.h" +#include "audio_region_view.h" #include "utils.h" #include "time_axis_view.h" #include "editor.h" -#include - - #include "i18n.h" - using namespace std; using namespace ARDOUR; +using namespace PBD; -AudioRegionGainLine::AudioRegionGainLine (string name, Session& s, AudioRegionView& r, Gnome::Canvas::Item& parent, - Curve& c, - gint (*point_callback)(Gnome::Canvas::Item*, GdkEvent*, gpointer), - gint (*line_callback)(Gnome::Canvas::Item*, GdkEvent*, gpointer)) - : AutomationLine (name, r.get_time_axis_view(), parent, c, point_callback, line_callback), - session (s), - rv (r) +AudioRegionGainLine::AudioRegionGainLine (const string & name, AudioRegionView& r, ArdourCanvas::Group& parent, boost::shared_ptr l) + : AutomationLine (name, r.get_time_axis_view(), parent, l) + , rv (r) { + // If this isn't true something is horribly wrong, and we'll get catastrophic gain values + assert(l->parameter().type() == EnvelopeAutomation); + + _time_converter->set_origin_b (r.region()->position() - r.region()->start()); + group->raise_to_top (); - set_verbose_cursor_uses_gain_mapping (true); + group->property_y() = 2; + set_uses_gain_mapping (true); terminal_points_can_slide = false; } void -AudioRegionGainLine::view_to_model_y (double& y) +AudioRegionGainLine::start_drag_single (ControlPoint* cp, double x, float fraction) { - y = slider_position_to_gain (y); - y = max (0.0, y); - y = min (2.0, y); -} + AutomationLine::start_drag_single (cp, x, fraction); -void -AudioRegionGainLine::model_to_view_y (double& y) -{ - y = gain_to_slider_position (y); -} + // XXX Stateful need to capture automation curve data -void -AudioRegionGainLine::start_drag (ControlPoint* cp, float fraction) -{ - AutomationLine::start_drag(cp,fraction); - if (!rv.region.envelope_active()) { - trackview.session().add_undo( bind( mem_fun(rv.region, &AudioRegion::set_envelope_active), false) ); + if (!rv.audio_region()->envelope_active()) { + trackview.session()->add_command(new MementoCommand(*(rv.audio_region().get()), &rv.audio_region()->get_state(), 0)); + rv.audio_region()->set_envelope_active(false); } } @@ -57,40 +70,30 @@ AudioRegionGainLine::start_drag (ControlPoint* cp, float fraction) void AudioRegionGainLine::remove_point (ControlPoint& cp) { - ModelRepresentation mr; - - model_representation (cp, mr); + trackview.editor().session()->begin_reversible_command (_("remove control point")); + XMLNode &before = alist->get_state(); - trackview.editor.current_session()->begin_reversible_command (_("remove control point")); - trackview.editor.current_session()->add_undo (get_memento()); - - if (!rv.region.envelope_active()) { - trackview.session().add_undo( bind( mem_fun(rv.region, &AudioRegion::set_envelope_active), false) ); - trackview.session().add_redo( bind( mem_fun(rv.region, &AudioRegion::set_envelope_active), true) ); - rv.region.set_envelope_active(true); + if (!rv.audio_region()->envelope_active()) { + rv.audio_region()->clear_changes (); + rv.audio_region()->set_envelope_active(true); + trackview.session()->add_command(new StatefulDiffCommand (rv.audio_region())); } - alist.erase (mr.start, mr.end); + alist->erase (cp.model()); - trackview.editor.current_session()->add_redo_no_execute (get_memento()); - trackview.editor.current_session()->commit_reversible_command (); - trackview.editor.current_session()->set_dirty (); + trackview.editor().session()->add_command (new MementoCommand(*alist.get(), &before, &alist->get_state())); + trackview.editor().session()->commit_reversible_command (); + trackview.editor().session()->set_dirty (); } void -AudioRegionGainLine::end_drag (ControlPoint* cp) +AudioRegionGainLine::end_drag (bool with_push, uint32_t final_index) { - if (!rv.region.envelope_active()) { - trackview.session().add_redo( bind( mem_fun(rv.region, &AudioRegion::set_envelope_active), true) ); - rv.region.set_envelope_active(true); + if (!rv.audio_region()->envelope_active()) { + rv.audio_region()->set_envelope_active(true); + trackview.session()->add_command(new MementoCommand(*(rv.audio_region().get()), 0, &rv.audio_region()->get_state())); } - AutomationLine::end_drag(cp); -} - -// This is a copy from AutomationList -UndoAction -AudioRegionGainLine::get_memento () -{ - return alist.get_memento(); + AutomationLine::end_drag (with_push, final_index); } +