diff options
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_ui.h | 2 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_ui_ed.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/editor.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/mixer_ui.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/route_params_ui.cc | 3 |
6 files changed, 7 insertions, 8 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 32d14144fb..159984fbb6 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -3950,7 +3950,7 @@ ARDOUR_UI::start_duplicate_routes () } void -ARDOUR_UI::add_route (Gtk::Window* /* ignored */) +ARDOUR_UI::add_route () { int count; diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index 032415aa85..295cbb4957 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -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 (); diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index 5cda9e8eab..607b8e7327 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -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); diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 77a0261be1..c3b93fd86e 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -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 (); } diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index c39ae33470..f27041b386 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -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 (); } diff --git a/gtk2_ardour/route_params_ui.cc b/gtk2_ardour/route_params_ui.cc index 82e6f10a15..19e2aa17ff 100644 --- a/gtk2_ardour/route_params_ui.cc +++ b/gtk2_ardour/route_params_ui.cc @@ -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()); } |