diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2016-04-23 11:55:58 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-05-31 15:30:41 -0400 |
commit | 9197116a1a20a2db32dc071aaf9bbac84204b86b (patch) | |
tree | 0af241cebc0a595b6e0181318ba0102cad59a64a | |
parent | a598b4a7088998319b0842e14d56e1cc73672631 (diff) |
change API for ARDOUR_UI::add_route() to no longer require a float window
-rw-r--r-- | gtk2_ardour/ardour_ui.h | 1 | ||||
-rw-r--r-- | gtk2_ardour/ardour_ui_ed.cc | 3 | ||||
-rw-r--r-- | gtk2_ardour/route_params_ui.cc | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index 4227c5fb28..737cb110af 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -255,6 +255,7 @@ public: void synchronize_sync_source_and_video_pullup (); void add_route (); + void add_routes_part_two (); void add_routes_thread (); diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index 088172446f..2ca83ca7bf 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -149,8 +149,7 @@ ARDOUR_UI::install_actions () act = global_actions.register_action (main_actions, X_("Close"), _("Close"), sigc::mem_fun(*this, &ARDOUR_UI::close_session)); ActionManager::session_sensitive_actions.push_back (act); - act = global_actions.register_action (main_actions, X_("AddTrackBus"), _("Add Track or Bus..."), - sigc::mem_fun(*this, &ARDOUR_UI::add_route)); + act = global_actions.register_action (main_actions, X_("AddTrackBus"), _("Add Track or Bus..."), sigc::mem_fun(*this, &ARDOUR_UI::add_route)); ActionManager::session_sensitive_actions.push_back (act); ActionManager::write_sensitive_actions.push_back (act); diff --git a/gtk2_ardour/route_params_ui.cc b/gtk2_ardour/route_params_ui.cc index 19e2aa17ff..16595b25a2 100644 --- a/gtk2_ardour/route_params_ui.cc +++ b/gtk2_ardour/route_params_ui.cc @@ -520,8 +520,7 @@ RouteParams_UI::show_track_menu() if (track_menu == 0) { track_menu = new Menu; track_menu->set_name ("ArdourContextMenu"); - track_menu->items().push_back - (MenuElem (_("Add Track or Bus"), sigc::mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::add_route))); + track_menu->items().push_back (MenuElem (_("Add Track or Bus"), sigc::mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::add_route))); } track_menu->popup (1, gtk_get_current_event_time()); } |