ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

re-introduce "add track/bus" from mixer window

This commit is contained in:
Robin Gareus 2016-05-06 03:08:46 +02:00
parent e89e799eb5
commit 5c9660b62e
6 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/ardour_ui.cc
View File

@ -3950,7 +3950,7 @@ ARDOUR_UI::start_duplicate_routes ()
}
void
ARDOUR_UI::add_route (Gtk::Window* /* ignored */)
ARDOUR_UI::add_route ()
{
int count;

2
gtk2_ardour/ardour_ui.h
View File

@ -255,7 +255,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
void synchronize_sync_source_and_video_pullup ();
void add_route (Gtk::Window* float_window);
void add_route ();
void add_routes_part_two ();
void add_routes_thread ();

2
gtk2_ardour/ardour_ui_ed.cc
View File

@ -149,7 +149,7 @@ ARDOUR_UI::install_actions ()
ActionManager::session_sensitive_actions.push_back (act);
act = global_actions.register_action (main_actions, X_("AddTrackBus"), _("Add Track or Bus..."),
sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::add_route), (Gtk::Window*) 0));
sigc::mem_fun(*this, &ARDOUR_UI::add_route));
ActionManager::session_sensitive_actions.push_back (act);
ActionManager::write_sensitive_actions.push_back (act);

2
gtk2_ardour/editor.cc
View File

@ -3805,7 +3805,7 @@ bool
Editor::edit_controls_button_release (GdkEventButton* ev)
{
if (Keyboard::is_context_menu_event (ev)) {
ARDOUR_UI::instance()->add_route (current_toplevel());
ARDOUR_UI::instance()->add_route ();
} else if (ev->button == 1) {
selection->clear_tracks ();
}

4
gtk2_ardour/mixer_ui.cc
View File

@ -1609,7 +1609,7 @@ Mixer_UI::strip_scroller_button_release (GdkEventButton* ev)
using namespace Menu_Helpers;
if (Keyboard::is_context_menu_event (ev)) {
// ARDOUR_UI::instance()->add_route (this);
ARDOUR_UI::instance()->add_route ();
return true;
}
@ -1965,7 +1965,7 @@ Mixer_UI::setup_track_display ()
void
Mixer_UI::new_track_or_bus ()
{
// ARDOUR_UI::instance()->add_route (this);
ARDOUR_UI::instance()->add_route ();
}

3
gtk2_ardour/route_params_ui.cc
View File

@ -521,8 +521,7 @@ RouteParams_UI::show_track_menu()
track_menu = new Menu;
track_menu->set_name ("ArdourContextMenu");
track_menu->items().push_back
(MenuElem (_("Add Track or Bus"),
sigc::bind (sigc::mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::add_route), (Gtk::Window*) 0)));
(MenuElem (_("Add Track or Bus"), sigc::mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::add_route)));
}
track_menu->popup (1, gtk_get_current_event_time());
}