From 2c9c2102138f20e32545f8bda7d1dc72587663e8 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 17 May 2016 08:21:05 -0400 Subject: manually fix rebase/merge issues caused by addition of plugin presets to methods which add a new track/bus --- gtk2_ardour/ardour_ui.cc | 4 ++-- gtk2_ardour/ardour_ui.h | 21 +++++++++++---------- gtk2_ardour/ardour_ui_ed.cc | 2 -- gtk2_ardour/editor_audio_import.cc | 6 ++++-- gtk2_ardour/editor_canvas_events.cc | 6 ++++-- gtk2_ardour/editor_drag.cc | 6 ++++-- gtk2_ardour/mixer_ui.cc | 4 ++-- 7 files changed, 27 insertions(+), 22 deletions(-) (limited to 'gtk2_ardour') diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index ac541901c1..07a4e5a5b8 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -1900,9 +1900,9 @@ ARDOUR_UI::session_add_midi_route ( one_midi_channel.set (DataType::MIDI, 1); if (disk) { - session_add_mixed_track (one_midi_channel, one_midi_channel, route_group, how_many, name_template, strict_io, order, instrument, pset); + session_add_mixed_track (one_midi_channel, one_midi_channel, route_group, how_many, name_template, strict_io, instrument, pset, order); } else { - session_add_midi_bus (route_group, how_many, name_template, strict_io, order, instrument, pset); + session_add_midi_bus (route_group, how_many, name_template, strict_io, instrument, pset, order); } } diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index 0a7996ebbd..53abcd0f17 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -274,6 +274,7 @@ public: void session_add_vca (std::string const &, uint32_t); + void session_add_audio_route (bool, int32_t, int32_t, ARDOUR::TrackMode, ARDOUR::RouteGroup *, uint32_t, std::string const &, bool, ARDOUR::PresentationInfo::order_t order); void session_add_audio_track ( int input_channels, int32_t output_channels, @@ -304,21 +305,21 @@ public: uint32_t how_many, std::string const & name_template, bool strict_io, - ARDOUR::PresentationInfo::order_t order, ARDOUR::PluginInfoPtr instrument, - ARDOUR::Plugin::PresetRecord* preset = NULL) { - session_add_midi_route (true, route_group, how_many, name_template, strict_io, order, instrument, preset); + ARDOUR::Plugin::PresetRecord* preset, + ARDOUR::PresentationInfo::order_t order + ) { + session_add_midi_route (true, route_group, how_many, name_template, strict_io, instrument, preset, order); } - void session_add_mixed_track (const ARDOUR::ChanCount&, const ARDOUR::ChanCount&, ARDOUR::RouteGroup*, uint32_t, std::string const &, bool, ARDOUR::PluginInfoPtr, + void session_add_mixed_track (const ARDOUR::ChanCount&, const ARDOUR::ChanCount&, ARDOUR::RouteGroup*, uint32_t, std::string const &, bool, + ARDOUR::PluginInfoPtr, ARDOUR::Plugin::PresetRecord* pset, ARDOUR::PresentationInfo::order_t order); - void session_add_midi_bus (ARDOUR::RouteGroup*, uint32_t, std::string const &, bool, ARDOUR::PluginInfoPtr, + void session_add_midi_bus (ARDOUR::RouteGroup*, uint32_t, std::string const &, bool, ARDOUR::PluginInfoPtr, ARDOUR::Plugin::PresetRecord* pset, ARDOUR::PresentationInfo::order_t order); - void session_add_audio_route (bool, int32_t, int32_t, ARDOUR::TrackMode, ARDOUR::RouteGroup *, uint32_t, std::string const &, bool, - ARDOUR::PresentationInfo::order_t order); - void session_add_midi_route (bool, ARDOUR::RouteGroup *, uint32_t, std::string const &, bool, ARDOUR::PresentationInfo::order_t order, - ARDOUR::PluginInfoPtr, ARDOUR::Plugin::PresetRecord*); - + void session_add_midi_route (bool, ARDOUR::RouteGroup *, uint32_t, std::string const &, bool, + ARDOUR::PluginInfoPtr, ARDOUR::Plugin::PresetRecord*, + ARDOUR::PresentationInfo::order_t order); void display_insufficient_ports_message (); void attach_to_engine (); diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index 2ca83ca7bf..08529bbe0e 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -705,8 +705,6 @@ ARDOUR_UI::save_ardour_state () current_tab = "mixer"; } else if (current_page_number == _tabs.page_num (rc_option_editor->contents())) { current_tab = "preferences"; - } else if (masters && (current_page_number == _tabs.page_num (masters->contents()))) { - current_tab == "masters"; } main_window_node.add_property (X_("current-tab"), current_tab); diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc index 11a53c4268..9ab03d0842 100644 --- a/gtk2_ardour/editor_audio_import.cc +++ b/gtk2_ardour/editor_audio_import.cc @@ -953,8 +953,10 @@ Editor::finish_bringing_in_material (boost::shared_ptr region, list > mt ( _session->new_midi_track (ChanCount (DataType::MIDI, 1), ChanCount (DataType::MIDI, 1), - instrument, - 0, 1, string(), + instrument, (Plugin::PresetRecord*) 0, + (RouteGroup*) 0, + 1, + string(), PresentationInfo::max_order)); if (mt.empty()) { diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc index 559961512d..0c31135e98 100644 --- a/gtk2_ardour/editor_canvas_events.cc +++ b/gtk2_ardour/editor_canvas_events.cc @@ -1280,12 +1280,14 @@ Editor::drop_regions (const Glib::RefPtr& /*context*/, output_chan = session()->master_out()->n_inputs().n_audio(); } list > audio_tracks; - audio_tracks = session()->new_audio_track (region->n_channels(), output_chan, 0, 1, region->name(), PresentationInfo::max_order, ARDOUR::Normal); + audio_tracks = session()->new_audio_track (region->n_channels(), output_chan, 0, 1, region->name(), PresentationInfo::max_order); rtav = axis_view_from_route (audio_tracks.front()); } else if (boost::dynamic_pointer_cast (region)) { ChanCount one_midi_port (DataType::MIDI, 1); list > midi_tracks; - midi_tracks = session()->new_midi_track (one_midi_port, one_midi_port, boost::shared_ptr(), 0, 1, region->name(), PresentationInfo::max_order, ARDOUR::Normal); + midi_tracks = session()->new_midi_track (one_midi_port, one_midi_port, boost::shared_ptr(), + (ARDOUR::Plugin::PresetRecord*) 0, + (ARDOUR::RouteGroup*) 0, 1, region->name(), PresentationInfo::max_order); rtav = axis_view_from_route (midi_tracks.front()); } else { return; diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index 16b52b9330..28745c01e6 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -1397,7 +1397,7 @@ RegionMoveDrag::create_destination_time_axis (boost::shared_ptr region, if ((Config->get_output_auto_connect() & AutoConnectMaster) && _editor->session()->master_out()) { output_chan = _editor->session()->master_out()->n_inputs().n_audio(); } - audio_tracks = _editor->session()->new_audio_track (region->n_channels(), output_chan, 0, 1, region->name(), PresentationInfo::max_order, ARDOUR::Normal); + audio_tracks = _editor->session()->new_audio_track (region->n_channels(), output_chan, 0, 1, region->name(), PresentationInfo::max_order); RouteTimeAxisView* rtav = _editor->axis_view_from_route (audio_tracks.front()); if (rtav) { rtav->set_height (original->current_height()); @@ -1406,7 +1406,9 @@ RegionMoveDrag::create_destination_time_axis (boost::shared_ptr region, } else { ChanCount one_midi_port (DataType::MIDI, 1); list > midi_tracks; - midi_tracks = _editor->session()->new_midi_track (one_midi_port, one_midi_port, boost::shared_ptr(), 0, 1, region->name(), PresentationInfo::max_order, ARDOUR::Normal); + midi_tracks = _editor->session()->new_midi_track (one_midi_port, one_midi_port, boost::shared_ptr(), + (ARDOUR::Plugin::PresetRecord*) 0, + (ARDOUR::RouteGroup*) 0, 1, region->name(), PresentationInfo::max_order); RouteTimeAxisView* rtav = _editor->axis_view_from_route (midi_tracks.front()); if (rtav) { rtav->set_height (original->current_height()); diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index 9f5cb5684f..3c8605642b 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -1702,7 +1702,7 @@ Mixer_UI::scroller_drag_data_received (const Glib::RefPtr& con } const void * d = data.get_data(); - const Gtkmm2ext::DnDTreeView* tv = reinterpret_cast*>(d); + const Gtkmm2ext::DnDTreeView* tv = reinterpret_cast*>(d); PluginPresetList nfos; TreeView* source; @@ -1717,7 +1717,7 @@ Mixer_UI::scroller_drag_data_received (const Glib::RefPtr& con if (!pip->is_instrument ()) { continue; } - ARDOUR_UI::instance()->session_add_midi_track (NULL, 1, _("MIDI"), Config->get_strict_io (), pip, ppp->_preset.valid ? &ppp->_preset : 0); + ARDOUR_UI::instance()->session_add_midi_track ((RouteGroup*) 0, 1, _("MIDI"), Config->get_strict_io (), pip, ppp->_preset.valid ? &ppp->_preset : 0, PresentationInfo::max_order); ok = true; } -- cgit v1.2.3