From 22819b8d2f3d71b8ddd0dfe22dbe635d9b0cbbcd Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Mon, 26 Feb 2018 17:02:24 -0600 Subject: Fix a rather large naming thinko: GridTypeSamples should be CDFrames. --- gtk2_ardour/editing_syms.h | 2 +- gtk2_ardour/editor.cc | 16 +++++++++------- gtk2_ardour/editor_actions.cc | 10 +++++----- gtk2_ardour/editor_rulers.cc | 2 +- gtk2_ardour/editor_tempodisplay.cc | 2 +- gtk2_ardour/enums.cc | 2 +- 6 files changed, 18 insertions(+), 16 deletions(-) (limited to 'gtk2_ardour') diff --git a/gtk2_ardour/editing_syms.h b/gtk2_ardour/editing_syms.h index 2483f86da0..c91076dceb 100644 --- a/gtk2_ardour/editing_syms.h +++ b/gtk2_ardour/editing_syms.h @@ -38,7 +38,7 @@ GRIDTYPE(GridTypeBeatDiv14) GRIDTYPE(GridTypeBeatDiv28) GRIDTYPE(GridTypeSmpte) GRIDTYPE(GridTypeMinSec) -GRIDTYPE(GridTypeSamples) +GRIDTYPE(GridTypeCDFrame) /* Changing this order will break the menu */ diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 04d6a72ec7..aace4f4512 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -181,7 +181,7 @@ static const gchar *_grid_type_strings[] = { N_("1/28 (32nd septuplet)"), N_("Timecode"), N_("MinSec"), - N_("Samples"), + N_("CD Frames"), 0 }; @@ -2164,7 +2164,7 @@ Editor::grid_musical() const case GridTypeNone: case GridTypeSmpte: case GridTypeMinSec: - case GridTypeSamples: + case GridTypeCDFrame: return false; } return false; @@ -2176,7 +2176,7 @@ Editor::grid_nonmusical() const switch (_grid_type) { case GridTypeSmpte: case GridTypeMinSec: - case GridTypeSamples: + case GridTypeCDFrame: return true; case GridTypeBeatDiv32: case GridTypeBeatDiv28: @@ -2262,13 +2262,15 @@ Editor::set_grid_to (GridType gt) ruler_timecode_action->set_active(false); ruler_minsec_action->set_active(true); ruler_samples_action->set_active(false); - } else if (_grid_type == GridTypeSamples) { + } else if (_grid_type == GridTypeCDFrame) { ruler_tempo_action->set_active(false); ruler_meter_action->set_active(false); ruler_bbt_action->set_active(false); ruler_timecode_action->set_active(false); ruler_minsec_action->set_active(false); + + ruler_cd_marker_action->set_active(true); ruler_samples_action->set_active(true); } @@ -3194,7 +3196,7 @@ Editor::build_grid_type_menu () grid_type_selector.AddMenuElem(SeparatorElem()); grid_type_selector.AddMenuElem (MenuElem (grid_type_strings[(int)GridTypeSmpte], sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_selection_done), (GridType) GridTypeSmpte))); grid_type_selector.AddMenuElem (MenuElem (grid_type_strings[(int)GridTypeMinSec], sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_selection_done), (GridType) GridTypeMinSec))); - grid_type_selector.AddMenuElem (MenuElem (grid_type_strings[(int)GridTypeSamples], sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_selection_done), (GridType) GridTypeSamples))); + grid_type_selector.AddMenuElem (MenuElem (grid_type_strings[(int)GridTypeCDFrame], sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_selection_done), (GridType) GridTypeCDFrame))); set_size_request_to_display_given_text (grid_type_selector, _("Long Grid"), COMBO_TRIANGLE_WIDTH, 2); // problem: some of the rarely-used grid names are very long. Just do something arbitary, translators: rename this if needed } @@ -3987,7 +3989,7 @@ Editor::get_grid_beat_divisions(samplepos_t position) case GridTypeNone: return 0; case GridTypeSmpte: return 0; case GridTypeMinSec: return 0; - case GridTypeSamples: return 0; + case GridTypeCDFrame: return 0; default: return 0; } return 0; @@ -4031,7 +4033,7 @@ Editor::get_grid_music_divisions (uint32_t event_state) case GridTypeNone: return 0; case GridTypeSmpte: return 0; case GridTypeMinSec: return 0; - case GridTypeSamples: return 0; + case GridTypeCDFrame: return 0; } return 0; } diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index 39e7e53579..3dd4fece17 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -579,7 +579,7 @@ Editor::register_actions () myactions.register_radio_action (snap_actions, grid_choice_group, X_("grid-type-smpte"), grid_type_strings[(int)GridTypeSmpte].c_str(), (sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_chosen), Editing::GridTypeSmpte))); myactions.register_radio_action (snap_actions, grid_choice_group, X_("grid-type-minsec"), grid_type_strings[(int)GridTypeMinSec].c_str(), (sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_chosen), Editing::GridTypeMinSec))); - myactions.register_radio_action (snap_actions, grid_choice_group, X_("grid-type-samples"), grid_type_strings[(int)GridTypeSamples].c_str(), (sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_chosen), Editing::GridTypeSamples))); + myactions.register_radio_action (snap_actions, grid_choice_group, X_("grid-type-cdframe"), grid_type_strings[(int)GridTypeCDFrame].c_str(), (sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_chosen), Editing::GridTypeCDFrame))); myactions.register_radio_action (snap_actions, grid_choice_group, X_("grid-type-beat"), grid_type_strings[(int)GridTypeBeat].c_str(), (sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_chosen), Editing::GridTypeBeat))); myactions.register_radio_action (snap_actions, grid_choice_group, X_("grid-type-bar"), grid_type_strings[(int)GridTypeBar].c_str(), (sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_chosen), Editing::GridTypeBar))); @@ -1095,8 +1095,8 @@ Editor::grid_type_action (GridType type) case Editing::GridTypeSmpte: action = "grid-type-smpte"; break; - case Editing::GridTypeSamples: - action = "grid-type-samples"; + case Editing::GridTypeCDFrame: + action = "grid-type-cdframe"; break; case Editing::GridTypeMinSec: action = "grid-type-minsec"; @@ -1158,7 +1158,7 @@ Editor::next_grid_choice () case Editing::GridTypeBeatDiv28: case Editing::GridTypeSmpte: case Editing::GridTypeMinSec: - case Editing::GridTypeSamples: + case Editing::GridTypeCDFrame: break; //do nothing } } @@ -1203,7 +1203,7 @@ Editor::prev_grid_choice () case Editing::GridTypeBeatDiv28: case Editing::GridTypeSmpte: case Editing::GridTypeMinSec: - case Editing::GridTypeSamples: + case Editing::GridTypeCDFrame: break; //do nothing } } diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc index bf67577ef3..c6ef090c79 100644 --- a/gtk2_ardour/editor_rulers.cc +++ b/gtk2_ardour/editor_rulers.cc @@ -1054,7 +1054,7 @@ Editor::compute_bbt_ruler_scale (samplepos_t lower, samplepos_t upper) case GridTypeNone: case GridTypeSmpte: case GridTypeMinSec: - case GridTypeSamples: + case GridTypeCDFrame: bbt_beat_subdivision = 4; break; } diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index df4613f7be..8446ca414b 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -382,7 +382,7 @@ Editor::maybe_draw_grid_lines () metric_get_bbt (grid_marks, _leftmost_sample, rightmost_sample, 12); } else if (_grid_type== GridTypeSmpte) { metric_get_timecode (grid_marks, _leftmost_sample, rightmost_sample, 12); - } else if (_grid_type == GridTypeSamples) { + } else if (_grid_type == GridTypeCDFrame) { metric_get_samples (grid_marks, _leftmost_sample, rightmost_sample, 12); } else if (_grid_type == GridTypeMinSec) { metric_get_minsec (grid_marks, _leftmost_sample, rightmost_sample, 12); diff --git a/gtk2_ardour/enums.cc b/gtk2_ardour/enums.cc index 4b8a138a98..ca1ce57398 100644 --- a/gtk2_ardour/enums.cc +++ b/gtk2_ardour/enums.cc @@ -114,7 +114,7 @@ setup_gtk_ardour_enums () REGISTER_ENUM (GridTypeBeatDiv28); REGISTER_ENUM (GridTypeSmpte); REGISTER_ENUM (GridTypeMinSec); - REGISTER_ENUM (GridTypeSamples); + REGISTER_ENUM (GridTypeCDFrame); REGISTER (grid_type); REGISTER_ENUM (SnapOff); -- cgit v1.2.3