From 47d143a45d12d5a195d4cb0bbf741ed338d64eaf Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Fri, 1 Mar 2019 00:52:36 +0100 Subject: [PATCH] Remove unused RulerType --- gtk2_ardour/editor.h | 18 +--------- gtk2_ardour/editor_actions.cc | 62 +++++++---------------------------- 2 files changed, 13 insertions(+), 67 deletions(-) diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 687631312f..55d05ca52f 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -873,21 +873,6 @@ private: ArdourCanvas::Rectangle* _canvas_drop_zone; bool canvas_drop_zone_event (GdkEvent* event); - enum RulerType { - ruler_metric_timecode = 0, - ruler_metric_bbt = 1, - ruler_metric_samples = 2, - ruler_metric_minsec = 3, - - ruler_time_tempo = 4, - ruler_time_meter = 5, - ruler_time_marker = 6, - ruler_time_range_marker = 7, - ruler_time_transport_marker = 8, - ruler_time_cd_marker = 9, - ruler_video_timeline = 10, - }; - Glib::RefPtr ruler_timecode_action; Glib::RefPtr ruler_bbt_action; Glib::RefPtr ruler_samples_action; @@ -911,8 +896,7 @@ private: void update_tempo_based_rulers (); void popup_ruler_menu (samplepos_t where = 0, ItemType type = RegionItem); void update_ruler_visibility (); - void set_ruler_visible (RulerType, bool); - void toggle_ruler_visibility (RulerType rt); + void toggle_ruler_visibility (); void ruler_toggled (int); bool ruler_label_button_release (GdkEventButton*); void store_ruler_visibility (); diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index 6c28a0a943..e523732421 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -588,20 +588,20 @@ Editor::register_actions () /* RULERS */ Glib::RefPtr ruler_actions = ActionManager::create_action_group (bindings, X_("Rulers")); - ruler_tempo_action = Glib::RefPtr::cast_static (ActionManager::register_toggle_action (ruler_actions, X_("toggle-tempo-ruler"), _("Tempo"), sigc::bind (sigc::mem_fun(*this, &Editor::toggle_ruler_visibility), ruler_time_tempo))); - ruler_meter_action = Glib::RefPtr::cast_static (ActionManager::register_toggle_action (ruler_actions, X_("toggle-meter-ruler"), _("Meter"), sigc::bind (sigc::mem_fun(*this, &Editor::toggle_ruler_visibility), ruler_time_meter))); - ruler_range_action = Glib::RefPtr::cast_static (ActionManager::register_toggle_action (ruler_actions, X_("toggle-range-ruler"), _("Ranges"), sigc::bind (sigc::mem_fun(*this, &Editor::toggle_ruler_visibility), ruler_time_range_marker))); - ruler_marker_action = Glib::RefPtr::cast_static (ActionManager::register_toggle_action (ruler_actions, X_("toggle-marker-ruler"), _("Markers"), sigc::bind (sigc::mem_fun(*this, &Editor::toggle_ruler_visibility), ruler_time_marker))); - ruler_cd_marker_action = Glib::RefPtr::cast_static (ActionManager::register_toggle_action (ruler_actions, X_("toggle-cd-marker-ruler"), _("CD Markers"), sigc::bind (sigc::mem_fun(*this, &Editor::toggle_ruler_visibility), ruler_time_cd_marker))); - ruler_loop_punch_action = Glib::RefPtr::cast_static (ActionManager::register_toggle_action (ruler_actions, X_("toggle-loop-punch-ruler"), _("Loop/Punch"), sigc::bind (sigc::mem_fun(*this, &Editor::toggle_ruler_visibility), ruler_time_transport_marker))); - ruler_bbt_action = Glib::RefPtr::cast_static (ActionManager::register_toggle_action (ruler_actions, X_("toggle-bbt-ruler"), _("Bars & Beats"), sigc::bind (sigc::mem_fun(*this, &Editor::toggle_ruler_visibility), ruler_metric_bbt))); - ruler_samples_action = Glib::RefPtr::cast_static (ActionManager::register_toggle_action (ruler_actions, X_("toggle-samples-ruler"), _("Samples"), sigc::bind (sigc::mem_fun(*this, &Editor::toggle_ruler_visibility), ruler_metric_samples))); - ruler_timecode_action = Glib::RefPtr::cast_static (ActionManager::register_toggle_action (ruler_actions, X_("toggle-timecode-ruler"), _("Timecode"), sigc::bind (sigc::mem_fun(*this, &Editor::toggle_ruler_visibility), ruler_metric_timecode))); - ruler_minsec_action = Glib::RefPtr::cast_static (ActionManager::register_toggle_action (ruler_actions, X_("toggle-minsec-ruler"), _("Min:Sec"), sigc::bind (sigc::mem_fun(*this, &Editor::toggle_ruler_visibility), ruler_metric_minsec))); + ruler_tempo_action = Glib::RefPtr::cast_static (ActionManager::register_toggle_action (ruler_actions, X_("toggle-tempo-ruler"), _("Tempo"), sigc::mem_fun(*this, &Editor::toggle_ruler_visibility))); + ruler_meter_action = Glib::RefPtr::cast_static (ActionManager::register_toggle_action (ruler_actions, X_("toggle-meter-ruler"), _("Meter"), sigc::mem_fun(*this, &Editor::toggle_ruler_visibility))); + ruler_range_action = Glib::RefPtr::cast_static (ActionManager::register_toggle_action (ruler_actions, X_("toggle-range-ruler"), _("Ranges"), sigc::mem_fun(*this, &Editor::toggle_ruler_visibility))); + ruler_marker_action = Glib::RefPtr::cast_static (ActionManager::register_toggle_action (ruler_actions, X_("toggle-marker-ruler"), _("Markers"), sigc::mem_fun(*this, &Editor::toggle_ruler_visibility))); + ruler_cd_marker_action = Glib::RefPtr::cast_static (ActionManager::register_toggle_action (ruler_actions, X_("toggle-cd-marker-ruler"), _("CD Markers"), sigc::mem_fun(*this, &Editor::toggle_ruler_visibility))); + ruler_loop_punch_action = Glib::RefPtr::cast_static (ActionManager::register_toggle_action (ruler_actions, X_("toggle-loop-punch-ruler"), _("Loop/Punch"), sigc::mem_fun(*this, &Editor::toggle_ruler_visibility))); + ruler_bbt_action = Glib::RefPtr::cast_static (ActionManager::register_toggle_action (ruler_actions, X_("toggle-bbt-ruler"), _("Bars & Beats"), sigc::mem_fun(*this, &Editor::toggle_ruler_visibility))); + ruler_samples_action = Glib::RefPtr::cast_static (ActionManager::register_toggle_action (ruler_actions, X_("toggle-samples-ruler"), _("Samples"), sigc::mem_fun(*this, &Editor::toggle_ruler_visibility))); + ruler_timecode_action = Glib::RefPtr::cast_static (ActionManager::register_toggle_action (ruler_actions, X_("toggle-timecode-ruler"), _("Timecode"), sigc::mem_fun(*this, &Editor::toggle_ruler_visibility))); + ruler_minsec_action = Glib::RefPtr::cast_static (ActionManager::register_toggle_action (ruler_actions, X_("toggle-minsec-ruler"), _("Min:Sec"), sigc::mem_fun(*this, &Editor::toggle_ruler_visibility))); ActionManager::register_action (editor_menu_actions, X_("VideoMonitorMenu"), _("Video Monitor")); - ruler_video_action = Glib::RefPtr::cast_static (ActionManager::register_toggle_action (ruler_actions, X_("toggle-video-ruler"), _("Video"), sigc::bind (sigc::mem_fun(*this, &Editor::toggle_ruler_visibility), ruler_video_timeline))); + ruler_video_action = Glib::RefPtr::cast_static (ActionManager::register_toggle_action (ruler_actions, X_("toggle-video-ruler"), _("Video"), sigc::mem_fun(*this, &Editor::toggle_ruler_visibility))); xjadeo_proc_action = Glib::RefPtr::cast_static (ActionManager::register_toggle_action (editor_actions, X_("ToggleJadeo"), _("Video Monitor"), sigc::mem_fun (*this, &Editor::set_xjadeo_proc))); xjadeo_ontop_action = Glib::RefPtr::cast_static (ActionManager::register_toggle_action (editor_actions, X_("toggle-vmon-ontop"), _("Always on Top"), sigc::bind (sigc::mem_fun (*this, &Editor::set_xjadeo_viewoption), (int) 1))); @@ -809,50 +809,12 @@ Editor::toggle_skip_playback () } void -Editor::toggle_ruler_visibility (RulerType rt) +Editor::toggle_ruler_visibility () { - const char* action = 0; - if (no_ruler_shown_update) { return; } - switch (rt) { - case ruler_metric_timecode: - action = "toggle-timecode-ruler"; - break; - case ruler_metric_bbt: - action = "toggle-bbt-ruler"; - break; - case ruler_metric_samples: - action = "toggle-samples-ruler"; - break; - case ruler_metric_minsec: - action = "toggle-minsec-ruler"; - break; - case ruler_time_tempo: - action = "toggle-tempo-ruler"; - break; - case ruler_time_meter: - action = "toggle-meter-ruler"; - break; - case ruler_time_marker: - action = "toggle-marker-ruler"; - break; - case ruler_time_range_marker: - action = "toggle-range-ruler"; - break; - case ruler_time_transport_marker: - action = "toggle-loop-punch-ruler"; - break; - case ruler_time_cd_marker: - action = "toggle-cd-marker-ruler"; - break; - case ruler_video_timeline: - action = "toggle-video-ruler"; - break; - } - update_ruler_visibility (); store_ruler_visibility (); }