diff options
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/add_midi_cc_track_dialog.cc | 4 | ||||
-rw-r--r-- | gtk2_ardour/add_midi_cc_track_dialog.h | 4 | ||||
-rw-r--r-- | gtk2_ardour/audio_time_axis.cc | 8 | ||||
-rw-r--r-- | gtk2_ardour/audio_time_axis.h | 2 | ||||
-rw-r--r-- | gtk2_ardour/automation_controller.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/automation_region_view.cc | 5 | ||||
-rw-r--r-- | gtk2_ardour/automation_region_view.h | 4 | ||||
-rw-r--r-- | gtk2_ardour/automation_time_axis.cc | 4 | ||||
-rw-r--r-- | gtk2_ardour/crossfade_edit.cc | 6 | ||||
-rw-r--r-- | gtk2_ardour/curvetest.cc | 4 | ||||
-rw-r--r-- | gtk2_ardour/gain_meter.cc | 8 | ||||
-rw-r--r-- | gtk2_ardour/generic_pluginui.cc | 4 | ||||
-rw-r--r-- | gtk2_ardour/midi_time_axis.cc | 23 | ||||
-rw-r--r-- | gtk2_ardour/midi_time_axis.h | 4 | ||||
-rw-r--r-- | gtk2_ardour/plugin_ui.h | 2 | ||||
-rw-r--r-- | gtk2_ardour/region_view.h | 2 | ||||
-rw-r--r-- | gtk2_ardour/route_time_axis.cc | 44 | ||||
-rw-r--r-- | gtk2_ardour/route_time_axis.h | 34 | ||||
-rw-r--r-- | gtk2_ardour/route_ui.cc | 8 | ||||
-rw-r--r-- | gtk2_ardour/route_ui.h | 2 | ||||
-rw-r--r-- | gtk2_ardour/time_axis_view.h | 4 |
21 files changed, 91 insertions, 87 deletions
diff --git a/gtk2_ardour/add_midi_cc_track_dialog.cc b/gtk2_ardour/add_midi_cc_track_dialog.cc index 98fd501a95..0c393f3981 100644 --- a/gtk2_ardour/add_midi_cc_track_dialog.cc +++ b/gtk2_ardour/add_midi_cc_track_dialog.cc @@ -74,12 +74,12 @@ AddMidiCCTrackDialog::AddMidiCCTrackDialog () } -ARDOUR::Parameter +Evoral::Parameter AddMidiCCTrackDialog::parameter () { int chan = _chan_spinner.get_value_as_int() - 1; int cc_num = _cc_num_spinner.get_value_as_int() - 1; - return Parameter(MidiCCAutomation, chan, cc_num); + return Evoral::Parameter(MidiCCAutomation, chan, cc_num); } diff --git a/gtk2_ardour/add_midi_cc_track_dialog.h b/gtk2_ardour/add_midi_cc_track_dialog.h index d3124044fe..b04456afc4 100644 --- a/gtk2_ardour/add_midi_cc_track_dialog.h +++ b/gtk2_ardour/add_midi_cc_track_dialog.h @@ -27,14 +27,14 @@ #include <gtkmm/spinbutton.h> #include <ardour/types.h> #include <ardour/data_type.h> -#include <ardour/parameter.h> +#include <evoral/Parameter.hpp> class AddMidiCCTrackDialog : public Gtk::Dialog { public: AddMidiCCTrackDialog (); - ARDOUR::Parameter parameter (); + Evoral::Parameter parameter (); private: Gtk::Adjustment _chan_adjustment; diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc index a991bffe54..14a94e7195 100644 --- a/gtk2_ardour/audio_time_axis.cc +++ b/gtk2_ardour/audio_time_axis.cc @@ -319,7 +319,7 @@ AudioTimeAxisView::set_waveform_scale (WaveformScale scale) } void -AudioTimeAxisView::create_automation_child (const Parameter& param, bool show) +AudioTimeAxisView::create_automation_child (const Evoral::Parameter& param, bool show) { if (param.type() == GainAutomation) { @@ -337,7 +337,7 @@ AudioTimeAxisView::create_automation_child (const Parameter& param, bool show) parent_canvas, _route->describe_parameter(param))); - add_automation_child(Parameter(GainAutomation), gain_track, show); + add_automation_child(Evoral::Parameter(GainAutomation), gain_track, show); } else if (param.type() == PanAutomation) { @@ -345,7 +345,7 @@ AudioTimeAxisView::create_automation_child (const Parameter& param, bool show) update_pans (show); } else { - error << "AudioTimeAxisView: unknown automation child " << param.symbol() << endmsg; + error << "AudioTimeAxisView: unknown automation child " << EventTypeMap::instance().to_symbol(param) << endmsg; } } @@ -370,7 +370,7 @@ AudioTimeAxisView::update_pans (bool show) false, parent_canvas, _route->describe_parameter(pan_control->parameter()))); - add_automation_child(Parameter(PanAutomation, i), pan_track, show); + add_automation_child(Evoral::Parameter(PanAutomation, i), pan_track, show); ++i; } } diff --git a/gtk2_ardour/audio_time_axis.h b/gtk2_ardour/audio_time_axis.h index ce5697d7c1..133a84e590 100644 --- a/gtk2_ardour/audio_time_axis.h +++ b/gtk2_ardour/audio_time_axis.h @@ -82,7 +82,7 @@ class AudioTimeAxisView : public RouteTimeAxisView guint32 show_at (double y, int& nth, Gtk::VBox *parent); void hide (); - void create_automation_child (const ARDOUR::Parameter& param, bool show); + void create_automation_child (const Evoral::Parameter& param, bool show); void first_idle (); diff --git a/gtk2_ardour/automation_controller.cc b/gtk2_ardour/automation_controller.cc index 263761dcc5..c9e04bf70b 100644 --- a/gtk2_ardour/automation_controller.cc +++ b/gtk2_ardour/automation_controller.cc @@ -68,7 +68,7 @@ AutomationController::create( { Gtk::Adjustment* adjustment = manage(new Gtk::Adjustment(param.normal(), param.min(), param.max())); if (!ac) { - PBD::warning << "Creating AutomationController for " << param.symbol() << endmsg; + PBD::warning << "Creating AutomationController for " << EventTypeMap::instance().to_symbol(param) << endmsg; ac = boost::dynamic_pointer_cast<AutomationControl>(parent->control_factory(param)); } else { assert(ac->parameter() == param); diff --git a/gtk2_ardour/automation_region_view.cc b/gtk2_ardour/automation_region_view.cc index c213b3feeb..d8b90e6458 100644 --- a/gtk2_ardour/automation_region_view.cc +++ b/gtk2_ardour/automation_region_view.cc @@ -26,7 +26,7 @@ AutomationRegionView::AutomationRegionView(ArdourCanvas::Group* parent, AutomationTimeAxisView& time_axis, boost::shared_ptr<ARDOUR::Region> region, - const ARDOUR::Parameter& param, + const Evoral::Parameter& param, boost::shared_ptr<ARDOUR::AutomationList> list, double spu, Gdk::Color& basic_color) @@ -65,7 +65,8 @@ void AutomationRegionView::create_line (boost::shared_ptr<ARDOUR::AutomationList> list) { _line = boost::shared_ptr<AutomationLine>(new AutomationLine( - list->parameter().symbol(), trackview, *get_canvas_group(), list)); + ARDOUR::EventTypeMap::instance().to_symbol(list->parameter()), + trackview, *get_canvas_group(), list)); _line->set_colors(); _line->show(); _line->show_all_control_points(); diff --git a/gtk2_ardour/automation_region_view.h b/gtk2_ardour/automation_region_view.h index 759382b562..dfe774aba6 100644 --- a/gtk2_ardour/automation_region_view.h +++ b/gtk2_ardour/automation_region_view.h @@ -42,7 +42,7 @@ public: AutomationRegionView(ArdourCanvas::Group*, AutomationTimeAxisView&, boost::shared_ptr<ARDOUR::Region>, - const ARDOUR::Parameter& parameter, + const Evoral::Parameter& parameter, boost::shared_ptr<ARDOUR::AutomationList>, double initial_samples_per_unit, Gdk::Color& basic_color); @@ -73,7 +73,7 @@ protected: void exited(); private: - ARDOUR::Parameter _parameter; + Evoral::Parameter _parameter; boost::shared_ptr<AutomationLine> _line; }; diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc index 299674dfdb..acb0921b7f 100644 --- a/gtk2_ardour/automation_time_axis.cc +++ b/gtk2_ardour/automation_time_axis.cc @@ -212,7 +212,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr<Ro } else { boost::shared_ptr<AutomationLine> line(new AutomationLine ( - _control->parameter().symbol(), + ARDOUR::EventTypeMap::instance().to_symbol(_control->parameter()), *this, *canvas_display, _control->alist())); @@ -884,7 +884,7 @@ AutomationTimeAxisView::set_state (const XMLNode& node) if ((*iter)->name() == state_node_name) { XMLProperty* type = (*iter)->property("automation-id"); - if (type && type->value() == _control->parameter().symbol()) { + if (type && type->value() == ARDOUR::EventTypeMap::instance().to_symbol(_control->parameter())) { XMLProperty *shown = (*iter)->property("shown_editor"); if (shown && shown->value() == "yes") { diff --git a/gtk2_ardour/crossfade_edit.cc b/gtk2_ardour/crossfade_edit.cc index 6e4cbb3457..3c67c62f68 100644 --- a/gtk2_ardour/crossfade_edit.cc +++ b/gtk2_ardour/crossfade_edit.cc @@ -65,9 +65,9 @@ CrossfadeEditor::Presets* CrossfadeEditor::fade_out_presets = 0; CrossfadeEditor::Half::Half () : line (0), - //normative_curve (Parameter(GainAutomation, 0.0, 1.0, 1.0)), // FIXME: GainAutomation? - normative_curve (Parameter(GainAutomation)), - gain_curve (Parameter(GainAutomation)) + //normative_curve (Evoral::Parameter(GainAutomation, 0.0, 1.0, 1.0)), // FIXME: GainAutomation? + normative_curve (Evoral::Parameter(GainAutomation)), + gain_curve (Evoral::Parameter(GainAutomation)) { } diff --git a/gtk2_ardour/curvetest.cc b/gtk2_ardour/curvetest.cc index 9235fb9ba9..15195ff2a5 100644 --- a/gtk2_ardour/curvetest.cc +++ b/gtk2_ardour/curvetest.cc @@ -34,8 +34,8 @@ curvetest (string filename) { ifstream in (filename.c_str()); stringstream line; - //Parameter param(GainAutomation, -1.0, +1.0, 0.0); - Parameter param(GainAutomation); + //Evoral::Parameter param(GainAutomation, -1.0, +1.0, 0.0); + Evoral::Parameter param(GainAutomation); AutomationList al (param); double minx = DBL_MAX; double maxx = DBL_MIN; diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index 182cf2d89d..a580ec6b38 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -148,16 +148,16 @@ GainMeterBase::GainMeterBase (boost::shared_ptr<IO> io, Session& s, gain_astate_menu.items().push_back (MenuElem (_("Manual"), bind (mem_fun (*_io, &IO::set_parameter_automation_state), - Parameter(GainAutomation), (AutoState) Off))); + Evoral::Parameter(GainAutomation), (AutoState) Off))); gain_astate_menu.items().push_back (MenuElem (_("Play"), bind (mem_fun (*_io, &IO::set_parameter_automation_state), - Parameter(GainAutomation), (AutoState) Play))); + Evoral::Parameter(GainAutomation), (AutoState) Play))); gain_astate_menu.items().push_back (MenuElem (_("Write"), bind (mem_fun (*_io, &IO::set_parameter_automation_state), - Parameter(GainAutomation), (AutoState) Write))); + Evoral::Parameter(GainAutomation), (AutoState) Write))); gain_astate_menu.items().push_back (MenuElem (_("Touch"), bind (mem_fun (*_io, &IO::set_parameter_automation_state), - Parameter(GainAutomation), (AutoState) Touch))); + Evoral::Parameter(GainAutomation), (AutoState) Touch))); gain_astyle_menu.items().push_back (MenuElem (_("Trim"))); gain_astyle_menu.items().push_back (MenuElem (_("Abs"))); diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc index 07573c1454..1c414d6785 100644 --- a/gtk2_ardour/generic_pluginui.cc +++ b/gtk2_ardour/generic_pluginui.cc @@ -185,7 +185,7 @@ GenericPluginUI::build () /* Don't show latency control ports */ - if (plugin->describe_parameter (Parameter(PluginAutomation, i)) == X_("latency")) { + if (plugin->describe_parameter (Evoral::Parameter(PluginAutomation, i)) == X_("latency")) { continue; } @@ -211,7 +211,7 @@ GenericPluginUI::build () boost::shared_ptr<ARDOUR::AutomationControl> c = boost::dynamic_pointer_cast<ARDOUR::AutomationControl>( - insert->data().control(Parameter(PluginAutomation, i))); + insert->data().control(Evoral::Parameter(PluginAutomation, i))); if ((cui = build_control_ui (i, c)) == 0) { error << string_compose(_("Plugin Editor: could not build control element for port %1"), i) << endmsg; diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc index 8d1f46d55a..bc036be991 100644 --- a/gtk2_ardour/midi_time_axis.cc +++ b/gtk2_ardour/midi_time_axis.cc @@ -263,10 +263,10 @@ MidiTimeAxisView::build_automation_action_menu () mem_fun(*this, &MidiTimeAxisView::add_cc_track))); automation_items.push_back (MenuElem (_("Bender"), sigc::bind(mem_fun(*this, &MidiTimeAxisView::add_parameter_track), - Parameter(MidiPitchBenderAutomation)))); + Evoral::Parameter(MidiPitchBenderAutomation)))); automation_items.push_back (MenuElem (_("Pressure"), sigc::bind(mem_fun(*this, &MidiTimeAxisView::add_parameter_track), - Parameter(MidiChannelPressureAutomation)))); + Evoral::Parameter(MidiChannelPressureAutomation)))); } @@ -328,10 +328,10 @@ void MidiTimeAxisView::show_all_automation () { if (midi_track()) { - const set<Parameter> params = midi_track()->midi_diskstream()-> + const set<Evoral::Parameter> params = midi_track()->midi_diskstream()-> midi_playlist()->contained_automation(); - for (set<Parameter>::const_iterator i = params.begin(); i != params.end(); ++i) { + for (set<Evoral::Parameter>::const_iterator i = params.begin(); i != params.end(); ++i) { create_automation_child(*i, true); } } @@ -343,10 +343,10 @@ void MidiTimeAxisView::show_existing_automation () { if (midi_track()) { - const set<Parameter> params = midi_track()->midi_diskstream()-> + const set<Evoral::Parameter> params = midi_track()->midi_diskstream()-> midi_playlist()->contained_automation(); - for (set<Parameter>::const_iterator i = params.begin(); i != params.end(); ++i) { + for (set<Evoral::Parameter>::const_iterator i = params.begin(); i != params.end(); ++i) { create_automation_child(*i, true); } } @@ -360,7 +360,7 @@ void MidiTimeAxisView::add_cc_track() { int response; - Parameter param; + Evoral::Parameter param(0, 0, 0); { AddMidiCCTrackDialog dialog; @@ -371,7 +371,7 @@ MidiTimeAxisView::add_cc_track() param = dialog.parameter(); } - if (response == Gtk::RESPONSE_ACCEPT) + if (param.type() != 0 && response == Gtk::RESPONSE_ACCEPT) create_automation_child(param, true); } @@ -379,13 +379,13 @@ MidiTimeAxisView::add_cc_track() /** Add an automation track for the given parameter (pitch bend, channel pressure). */ void -MidiTimeAxisView::add_parameter_track(const Parameter& param) +MidiTimeAxisView::add_parameter_track(const Evoral::Parameter& param) { create_automation_child(param, true); } void -MidiTimeAxisView::create_automation_child (const Parameter& param, bool show) +MidiTimeAxisView::create_automation_child (const Evoral::Parameter& param, bool show) { if ( param.type() == MidiCCAutomation || param.type() == MidiPgmChangeAutomation || @@ -419,7 +419,8 @@ MidiTimeAxisView::create_automation_child (const Parameter& param, bool show) add_automation_child(param, track, show); } else { - error << "MidiTimeAxisView: unknown automation child " << param.symbol() << endmsg; + error << "MidiTimeAxisView: unknown automation child " + << ARDOUR::EventTypeMap::instance().to_symbol(param) << endmsg; } } diff --git a/gtk2_ardour/midi_time_axis.h b/gtk2_ardour/midi_time_axis.h index 7a1a3ffc5c..18dfedcaf0 100644 --- a/gtk2_ardour/midi_time_axis.h +++ b/gtk2_ardour/midi_time_axis.h @@ -70,8 +70,8 @@ class MidiTimeAxisView : public RouteTimeAxisView void show_all_automation (); void show_existing_automation (); void add_cc_track (); - void add_parameter_track (const ARDOUR::Parameter& param); - void create_automation_child (const ARDOUR::Parameter& param, bool show); + void add_parameter_track (const Evoral::Parameter& param); + void create_automation_child (const Evoral::Parameter& param, bool show); ARDOUR::NoteMode note_mode() const { return _note_mode; } diff --git a/gtk2_ardour/plugin_ui.h b/gtk2_ardour/plugin_ui.h index 19c2774be0..a957fc37cb 100644 --- a/gtk2_ardour/plugin_ui.h +++ b/gtk2_ardour/plugin_ui.h @@ -152,7 +152,7 @@ class GenericPluginUI : public PlugUIBase, public Gtk::VBox boost::shared_ptr<ARDOUR::AutomationControl> control; - ARDOUR::Parameter parameter() { return control->parameter(); } + Evoral::Parameter parameter() { return control->parameter(); } /* input */ diff --git a/gtk2_ardour/region_view.h b/gtk2_ardour/region_view.h index a001e241f1..987b2d66a9 100644 --- a/gtk2_ardour/region_view.h +++ b/gtk2_ardour/region_view.h @@ -144,7 +144,7 @@ class RegionView : public TimeAxisViewItem vector<GhostRegion*> ghosts; - typedef std::map<const ARDOUR::Parameter, boost::shared_ptr<AutomationRegionView> > AutomationChildren; + typedef std::map<const Evoral::Parameter, boost::shared_ptr<AutomationRegionView> > AutomationChildren; AutomationChildren _automation_children; }; diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index 6d6188c146..fe03190b67 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -51,7 +51,7 @@ #include <ardour/session.h> #include <ardour/session_playlist.h> #include <ardour/utils.h> -#include <ardour/parameter.h> +#include <evoral/Parameter.hpp> #include <ardour/profile.h> #include "ardour_ui.h" @@ -427,7 +427,7 @@ RouteTimeAxisView::set_state (const XMLNode& node) for (iter = kids.begin(); iter != kids.end(); ++iter) { if ((*iter)->name() == AutomationTimeAxisView::state_node_name) { if ((prop = (*iter)->property ("automation-id")) != 0) { - Parameter param(prop->value()); + Evoral::Parameter param = ARDOUR::EventTypeMap::instance().new_parameter(prop->value()); bool show = ((prop = (*iter)->property ("shown")) != 0) && prop->value() == "yes"; create_automation_child(param, show); } else { @@ -461,7 +461,7 @@ RouteTimeAxisView::build_automation_action_menu () automation_items.push_back (MenuElem (_("Plugins"), subplugin_menu)); - map<ARDOUR::Parameter, RouteAutomationNode*>::iterator i; + map<Evoral::Parameter, RouteAutomationNode*>::iterator i; for (i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) { automation_items.push_back (SeparatorElem()); @@ -1187,7 +1187,7 @@ RouteTimeAxisView::get_inverted_selectables (Selection& sel, list<Selectable*>& } bool -RouteTimeAxisView::show_automation(Parameter param) +RouteTimeAxisView::show_automation(Evoral::Parameter param) { return (_show_automation.find(param) != _show_automation.end()); } @@ -1195,9 +1195,9 @@ RouteTimeAxisView::show_automation(Parameter param) /** Retuns NULL if track for \a param doesn't exist. */ RouteTimeAxisView::RouteAutomationNode* -RouteTimeAxisView::automation_track(Parameter param) +RouteTimeAxisView::automation_track(Evoral::Parameter param) { - map<ARDOUR::Parameter, RouteAutomationNode*>::iterator i = _automation_tracks.find(param); + map<Evoral::Parameter, RouteAutomationNode*>::iterator i = _automation_tracks.find(param); if (i != _automation_tracks.end()) return i->second; @@ -1210,7 +1210,7 @@ RouteTimeAxisView::automation_track(Parameter param) RouteTimeAxisView::RouteAutomationNode* RouteTimeAxisView::automation_track(AutomationType type) { - return automation_track(Parameter(type)); + return automation_track(Evoral::Parameter(type)); } RouteGroup* @@ -1515,7 +1515,7 @@ RouteTimeAxisView::color_handler () } void -RouteTimeAxisView::toggle_automation_track (Parameter param) +RouteTimeAxisView::toggle_automation_track (Evoral::Parameter param) { RouteAutomationNode* node = automation_track(param); @@ -1544,7 +1544,7 @@ RouteTimeAxisView::toggle_automation_track (Parameter param) } void -RouteTimeAxisView::automation_track_hidden (Parameter param) +RouteTimeAxisView::automation_track_hidden (Evoral::Parameter param) { RouteAutomationNode* ran = automation_track(param); if (!ran) { @@ -1569,7 +1569,7 @@ RouteTimeAxisView::show_all_automation () /* Show our automation */ - map<ARDOUR::Parameter, RouteAutomationNode*>::iterator i; + map<Evoral::Parameter, RouteAutomationNode*>::iterator i; for (i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) { i->second->track->set_marked_for_display (true); i->second->track->canvas_display->show(); @@ -1604,7 +1604,7 @@ RouteTimeAxisView::show_existing_automation () /* Show our automation */ - map<ARDOUR::Parameter, RouteAutomationNode*>::iterator i; + map<Evoral::Parameter, RouteAutomationNode*>::iterator i; for (i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) { if (i->second->track->line() && i->second->track->line()->npoints() > 0) { i->second->track->set_marked_for_display (true); @@ -1637,7 +1637,7 @@ RouteTimeAxisView::hide_all_automation () /* Hide our automation */ - for (map<ARDOUR::Parameter, RouteAutomationNode*>::iterator i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) { + for (map<Evoral::Parameter, RouteAutomationNode*>::iterator i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) { i->second->track->set_marked_for_display (false); i->second->track->hide (); i->second->track->get_state_node()->add_property ("shown", X_("no")); @@ -1700,7 +1700,7 @@ RouteTimeAxisView::remove_processor_automation_node (ProcessorAutomationNode* pa } RouteTimeAxisView::ProcessorAutomationNode* -RouteTimeAxisView::find_processor_automation_node (boost::shared_ptr<Processor> processor, Parameter what) +RouteTimeAxisView::find_processor_automation_node (boost::shared_ptr<Processor> processor, Evoral::Parameter what) { for (list<ProcessorAutomationInfo*>::iterator i = processor_automation.begin(); i != processor_automation.end(); ++i) { @@ -1737,7 +1737,7 @@ legalize_for_xml_node (string str) void -RouteTimeAxisView::add_processor_automation_curve (boost::shared_ptr<Processor> processor, Parameter what) +RouteTimeAxisView::add_processor_automation_curve (boost::shared_ptr<Processor> processor, Evoral::Parameter what) { string name; ProcessorAutomationNode* pan; @@ -1803,12 +1803,12 @@ RouteTimeAxisView::processor_automation_track_hidden (RouteTimeAxisView::Process void RouteTimeAxisView::add_existing_processor_automation_curves (boost::shared_ptr<Processor> processor) { - set<Parameter> s; + set<Evoral::Parameter> s; boost::shared_ptr<AutomationLine> al; processor->what_has_visible_data (s); - for (set<Parameter>::iterator i = s.begin(); i != s.end(); ++i) { + for (set<Evoral::Parameter>::iterator i = s.begin(); i != s.end(); ++i) { if ((al = find_processor_automation_curve (processor, *i)) != 0) { al->queue_reset (); @@ -1819,7 +1819,7 @@ RouteTimeAxisView::add_existing_processor_automation_curves (boost::shared_ptr<P } void -RouteTimeAxisView::add_automation_child(Parameter param, boost::shared_ptr<AutomationTimeAxisView> track, bool show) +RouteTimeAxisView::add_automation_child(Evoral::Parameter param, boost::shared_ptr<AutomationTimeAxisView> track, bool show) { using namespace Menu_Helpers; @@ -1864,8 +1864,8 @@ RouteTimeAxisView::add_processor_to_subplugin_menu (boost::shared_ptr<Processor> ProcessorAutomationInfo *rai; list<ProcessorAutomationInfo*>::iterator x; - const std::set<Parameter>& automatable = processor->what_can_be_automated (); - std::set<Parameter> has_visible_automation; + const std::set<Evoral::Parameter>& automatable = processor->what_can_be_automated (); + std::set<Evoral::Parameter> has_visible_automation; processor->what_has_visible_data(has_visible_automation); @@ -1900,7 +1900,7 @@ RouteTimeAxisView::add_processor_to_subplugin_menu (boost::shared_ptr<Processor> items.clear (); - for (std::set<Parameter>::const_iterator i = automatable.begin(); i != automatable.end(); ++i) { + for (std::set<Evoral::Parameter>::const_iterator i = automatable.begin(); i != automatable.end(); ++i) { ProcessorAutomationNode* pan; CheckMenuItem* mitem; @@ -2014,7 +2014,7 @@ RouteTimeAxisView::processors_changed () } boost::shared_ptr<AutomationLine> -RouteTimeAxisView::find_processor_automation_curve (boost::shared_ptr<Processor> processor, Parameter what) +RouteTimeAxisView::find_processor_automation_curve (boost::shared_ptr<Processor> processor, Evoral::Parameter what) { ProcessorAutomationNode* pan; @@ -2050,7 +2050,7 @@ RouteTimeAxisView::set_layer_display (LayerDisplay d) boost::shared_ptr<AutomationTimeAxisView> -RouteTimeAxisView::automation_child(ARDOUR::Parameter param) +RouteTimeAxisView::automation_child(Evoral::Parameter param) { AutomationTracks::iterator i = _automation_tracks.find(param); if (i != _automation_tracks.end()) diff --git a/gtk2_ardour/route_time_axis.h b/gtk2_ardour/route_time_axis.h index b098894d8c..73d3295aaf 100644 --- a/gtk2_ardour/route_time_axis.h +++ b/gtk2_ardour/route_time_axis.h @@ -82,7 +82,7 @@ public: void set_selected_regionviews (RegionSelection&); void get_selectables (nframes_t start, nframes_t end, double top, double bot, list<Selectable *>&); void get_inverted_selectables (Selection&, list<Selectable*>&); - bool show_automation(ARDOUR::Parameter param); + bool show_automation(Evoral::Parameter param); void set_layer_display (LayerDisplay d); boost::shared_ptr<ARDOUR::Region> find_next_region (nframes_t pos, ARDOUR::RegionPoint, int32_t dir); @@ -109,24 +109,24 @@ public: /* This is a bit nasty to expose :/ */ struct RouteAutomationNode { - ARDOUR::Parameter param; + Evoral::Parameter param; Gtk::CheckMenuItem* menu_item; boost::shared_ptr<AutomationTimeAxisView> track; - RouteAutomationNode (ARDOUR::Parameter par, Gtk::CheckMenuItem* mi, boost::shared_ptr<AutomationTimeAxisView> tr) + RouteAutomationNode (Evoral::Parameter par, Gtk::CheckMenuItem* mi, boost::shared_ptr<AutomationTimeAxisView> tr) : param (par), menu_item (mi), track (tr) {} }; - virtual void create_automation_child (const ARDOUR::Parameter& param, bool show) = 0; + virtual void create_automation_child (const Evoral::Parameter& param, bool show) = 0; /* make sure we get the right version of this */ - XMLNode* get_automation_child_xml_node (ARDOUR::Parameter param) { return RouteUI::get_automation_child_xml_node (param); } + XMLNode* get_automation_child_xml_node (Evoral::Parameter param) { return RouteUI::get_automation_child_xml_node (param); } - typedef map<ARDOUR::Parameter, RouteAutomationNode*> AutomationTracks; + typedef map<Evoral::Parameter, RouteAutomationNode*> AutomationTracks; AutomationTracks automation_tracks() { return _automation_tracks; } - boost::shared_ptr<AutomationTimeAxisView> automation_child(ARDOUR::Parameter param); + boost::shared_ptr<AutomationTimeAxisView> automation_child(Evoral::Parameter param); string name() const; StreamView* view() const { return _view; } @@ -148,12 +148,12 @@ protected: friend class StreamView; struct ProcessorAutomationNode { - ARDOUR::Parameter what; + Evoral::Parameter what; Gtk::CheckMenuItem* menu_item; boost::shared_ptr<AutomationTimeAxisView> view; RouteTimeAxisView& parent; - ProcessorAutomationNode (ARDOUR::Parameter w, Gtk::CheckMenuItem* mitem, RouteTimeAxisView& p) + ProcessorAutomationNode (Evoral::Parameter w, Gtk::CheckMenuItem* mitem, RouteTimeAxisView& p) : what (w), menu_item (mitem), parent (p) {} ~ProcessorAutomationNode (); @@ -188,21 +188,21 @@ protected: void processor_automation_track_hidden (ProcessorAutomationNode*, boost::shared_ptr<ARDOUR::Processor>); - void automation_track_hidden (ARDOUR::Parameter param); + void automation_track_hidden (Evoral::Parameter param); - RouteAutomationNode* automation_track(ARDOUR::Parameter param); + RouteAutomationNode* automation_track(Evoral::Parameter param); RouteAutomationNode* automation_track(ARDOUR::AutomationType type); ProcessorAutomationNode* - find_processor_automation_node (boost::shared_ptr<ARDOUR::Processor> i, ARDOUR::Parameter); + find_processor_automation_node (boost::shared_ptr<ARDOUR::Processor> i, Evoral::Parameter); boost::shared_ptr<AutomationLine> - find_processor_automation_curve (boost::shared_ptr<ARDOUR::Processor> i, ARDOUR::Parameter); + find_processor_automation_curve (boost::shared_ptr<ARDOUR::Processor> i, Evoral::Parameter); - void add_processor_automation_curve (boost::shared_ptr<ARDOUR::Processor> r, ARDOUR::Parameter); + void add_processor_automation_curve (boost::shared_ptr<ARDOUR::Processor> r, Evoral::Parameter); void add_existing_processor_automation_curves (boost::shared_ptr<ARDOUR::Processor>); - void add_automation_child(ARDOUR::Parameter param, boost::shared_ptr<AutomationTimeAxisView> track, bool show=true); + void add_automation_child(Evoral::Parameter param, boost::shared_ptr<AutomationTimeAxisView> track, bool show=true); void reset_processor_automation_curves (); @@ -237,7 +237,7 @@ protected: void rename_current_playlist (); void automation_click (); - void toggle_automation_track (ARDOUR::Parameter param); + void toggle_automation_track (Evoral::Parameter param); virtual void show_all_automation (); virtual void show_existing_automation (); virtual void hide_all_automation (); @@ -297,7 +297,7 @@ protected: ProcessorAutomationCurves processor_automation_curves; // Set from XML so context menu automation buttons can be correctly initialized - set<ARDOUR::Parameter> _show_automation; + set<Evoral::Parameter> _show_automation; AutomationTracks _automation_tracks; diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index c02c4109b1..44032a4ea5 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -766,24 +766,26 @@ RouteUI::ensure_xml_node () } XMLNode* -RouteUI::get_automation_child_xml_node (Parameter param) +RouteUI::get_automation_child_xml_node (Evoral::Parameter param) { ensure_xml_node (); XMLNodeList kids = xml_node->children(); XMLNodeConstIterator iter; + const string sym = ARDOUR::EventTypeMap::instance().to_symbol(param); + for (iter = kids.begin(); iter != kids.end(); ++iter) { if ((*iter)->name() == AutomationTimeAxisView::state_node_name) { XMLProperty* type = (*iter)->property("automation-id"); - if (type && type->value() == param.symbol()) + if (type && type->value() == sym) return *iter; } } // Didn't find it, make a new one XMLNode* child = new XMLNode (AutomationTimeAxisView::state_node_name); - child->add_property("automation-id", param.symbol()); + child->add_property("automation-id", sym); xml_node->add_child_nocopy (*child); return child; diff --git a/gtk2_ardour/route_ui.h b/gtk2_ardour/route_ui.h index aecf351f3a..e18eda6871 100644 --- a/gtk2_ardour/route_ui.h +++ b/gtk2_ardour/route_ui.h @@ -86,7 +86,7 @@ class RouteUI : public virtual AxisView XMLNode *xml_node; void ensure_xml_node (); - virtual XMLNode* get_automation_child_xml_node (ARDOUR::Parameter param); + virtual XMLNode* get_automation_child_xml_node (Evoral::Parameter param); bool mute_press(GdkEventButton*); bool mute_release(GdkEventButton*); diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h index ae4d035af8..9d0c536a8f 100644 --- a/gtk2_ardour/time_axis_view.h +++ b/gtk2_ardour/time_axis_view.h @@ -37,7 +37,7 @@ #include <ardour/types.h> #include <ardour/region.h> -#include <ardour/parameter.h> +#include <evoral/Parameter.hpp> #include "prompter.h" #include "axis_view.h" @@ -230,7 +230,7 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful /* call this on the parent */ - virtual XMLNode* get_automation_child_xml_node (ARDOUR::Parameter param) { return 0; } + virtual XMLNode* get_automation_child_xml_node (Evoral::Parameter param) { return 0; } typedef std::vector<boost::shared_ptr<TimeAxisView> > Children; |