diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-08-22 09:41:53 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-08-22 09:41:59 -0400 |
| commit | 39e9add5c03a9870c38092df8a1b8a02ef8cf8fe (patch) | |
| tree | 22edfae60903b6e04287ecb51f5ed87b22aa3f6e /gtk2_ardour | |
| parent | cab3fc09de98bc5cec63fda421e78268bec1d816 (diff) | |
use insert at specification when duplicating tracks/busses
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_ui.h | 3 | ||||
| -rw-r--r-- | gtk2_ardour/duplicate_routes_dialog.cc | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index d1a14aed7b..d47723260e 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -4063,9 +4063,9 @@ ARDOUR_UI::add_route_dialog_finished (int r) if (!template_path.empty()) { if (add_route_dialog->name_template_is_default()) { - _session->new_route_from_template (count, template_path, string()); + _session->new_route_from_template (count, PresentationInfo::max_order, template_path, string()); } else { - _session->new_route_from_template (count, template_path, add_route_dialog->name_template()); + _session->new_route_from_template (count, PresentationInfo::max_order, template_path, add_route_dialog->name_template()); } return; } diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index a6d66b4fa4..c5e4010f0f 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -377,6 +377,8 @@ public: Gtkmm2ext::ActionMap global_actions; + ARDOUR::PresentationInfo::order_t translate_order (RouteDialogs::InsertAt); + protected: friend class PublicEditor; @@ -681,7 +683,6 @@ private: bool save_as_progress_update (float fraction, int64_t cnt, int64_t total, Gtk::Label* label, Gtk::ProgressBar* bar); void save_session_as (); void rename_session (); - ARDOUR::PresentationInfo::order_t translate_order (RouteDialogs::InsertAt); int create_mixer (); int create_editor (); diff --git a/gtk2_ardour/duplicate_routes_dialog.cc b/gtk2_ardour/duplicate_routes_dialog.cc index 3e34f9e381..1b97599c5b 100644 --- a/gtk2_ardour/duplicate_routes_dialog.cc +++ b/gtk2_ardour/duplicate_routes_dialog.cc @@ -22,6 +22,7 @@ #include "ardour/route.h" #include "ardour/session.h" +#include "ardour_ui.h" #include "editor.h" #include "duplicate_routes_dialog.h" #include "selection.h" @@ -170,7 +171,7 @@ DuplicateRouteDialog::on_response (int response) } XMLNode& state (rui->route()->get_state()); - RouteList rl = _session->new_route_from_template (cnt, state, std::string(), playlist_action); + RouteList rl = _session->new_route_from_template (cnt, ARDOUR_UI::instance()->translate_order (insert_at()), state, std::string(), playlist_action); /* normally the state node would be added to a parent, and * ownership would transfer. Because we don't do that here, |