diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc index fe15100064..19e2731888 100644 --- a/gtk2_ardour/ardour_ui_dependents.cc +++ b/gtk2_ardour/ardour_ui_dependents.cc @@ -90,7 +90,6 @@ ARDOUR_UI::we_have_dependents () */ ProcessorBox::register_actions (); StepEntry::setup_actions_and_bindings (); - TriggerUI::setup_actions_and_bindings (); ClipEditorBox::init (); /* Global, editor, mixer, processor box actions are defined now. Link diff --git a/gtk2_ardour/trigger_ui.cc b/gtk2_ardour/trigger_ui.cc index 71d1af1044..3f2d918c3f 100644 --- a/gtk2_ardour/trigger_ui.cc +++ b/gtk2_ardour/trigger_ui.cc @@ -68,9 +68,6 @@ std::string TriggerUI::longest_launch; std::vector TriggerUI::stretch_mode_strings; std::string TriggerUI::longest_stretch_mode; -Gtkmm2ext::Bindings* TriggerUI::bindings = 0; -Glib::RefPtr TriggerUI::trigger_actions; - TriggerUI::TriggerUI () : _renaming (false) , _file_chooser (0) @@ -140,43 +137,6 @@ TriggerUI::trigger_swap (uint32_t n) trigger_changed (Properties::name); } - -void -TriggerUI::setup_actions_and_bindings () -{ - load_bindings (); - register_actions (); -} - -void -TriggerUI::load_bindings () -{ - bindings = Bindings::get_bindings (X_("Cues")); -} - -void -TriggerUI::register_actions () -{ - trigger_actions = ActionManager::create_action_group (bindings, X_("Cues")); - - for (int32_t n = 0; n < TriggerBox::default_triggers_per_box; ++n) { - const std::string action_name = string_compose ("trigger-cue-%1", n); - const std::string display_name = string_compose (_("Trigger Cue %1"), cue_marker_name (n)); - - ActionManager::register_action (trigger_actions, action_name.c_str (), display_name.c_str (), sigc::bind (sigc::ptr_fun (TriggerUI::trigger_cue_row), n)); - } -} - -void -TriggerUI::trigger_cue_row (int32_t n) -{ - Session* s = AudioEngine::instance()->session(); - - if (s) { - s->trigger_cue_row (n); - } -} - void TriggerUI::choose_color () { diff --git a/gtk2_ardour/trigger_ui.h b/gtk2_ardour/trigger_ui.h index 83e4d4e09b..f6fc7d938d 100644 --- a/gtk2_ardour/trigger_ui.h +++ b/gtk2_ardour/trigger_ui.h @@ -94,13 +94,6 @@ public: private: void trigger_changed (PBD::PropertyChange const& ); //calls on_trigger_changed to subclasses - /* Actions for Triggers: accessed via ardour_ui and shortcuts and lua */ - static Glib::RefPtr trigger_actions; - static void trigger_cue_row (int32_t); - static Gtkmm2ext::Bindings* bindings; - static void load_bindings (); - static void register_actions (); - protected: /* all of this for name editing ... */ bool namebox_button_press (GdkEventButton*);