From e1b380b302de6a12b7f3eae57eebcf5b9bd8d807 Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Mon, 26 Feb 2018 18:38:18 -0600 Subject: [PATCH] Rename SMPTE enum back to Timecode. --- gtk2_ardour/editing_syms.h | 2 +- gtk2_ardour/editor.cc | 12 ++++++------ gtk2_ardour/editor_actions.cc | 12 ++++++------ gtk2_ardour/editor_rulers.cc | 2 +- gtk2_ardour/editor_tempodisplay.cc | 2 +- gtk2_ardour/enums.cc | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/gtk2_ardour/editing_syms.h b/gtk2_ardour/editing_syms.h index c91076dceb..47ffb0b04e 100644 --- a/gtk2_ardour/editing_syms.h +++ b/gtk2_ardour/editing_syms.h @@ -36,7 +36,7 @@ GRIDTYPE(GridTypeBeatDiv20) GRIDTYPE(GridTypeBeatDiv7) //Septuplet eighths GRIDTYPE(GridTypeBeatDiv14) GRIDTYPE(GridTypeBeatDiv28) -GRIDTYPE(GridTypeSmpte) +GRIDTYPE(GridTypeTimecode) GRIDTYPE(GridTypeMinSec) GRIDTYPE(GridTypeCDFrame) diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index aace4f4512..6a2f9561f9 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -2162,7 +2162,7 @@ Editor::grid_musical() const case GridTypeBar: return true; case GridTypeNone: - case GridTypeSmpte: + case GridTypeTimecode: case GridTypeMinSec: case GridTypeCDFrame: return false; @@ -2174,7 +2174,7 @@ bool Editor::grid_nonmusical() const { switch (_grid_type) { - case GridTypeSmpte: + case GridTypeTimecode: case GridTypeMinSec: case GridTypeCDFrame: return true; @@ -2246,7 +2246,7 @@ Editor::set_grid_to (GridType gt) ruler_timecode_action->set_active(false); ruler_minsec_action->set_active(false); ruler_samples_action->set_active(false); - } else if (_grid_type == GridTypeSmpte) { + } else if (_grid_type == GridTypeTimecode) { ruler_tempo_action->set_active(false); ruler_meter_action->set_active(false); @@ -3194,7 +3194,7 @@ Editor::build_grid_type_menu () grid_type_selector.AddMenuElem (Menu_Helpers::MenuElem (_("Septuplets"), *_septuplet_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)GridTypeTimecode], sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_selection_done), (GridType) GridTypeTimecode))); 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)GridTypeCDFrame], sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_selection_done), (GridType) GridTypeCDFrame))); @@ -3987,7 +3987,7 @@ Editor::get_grid_beat_divisions(samplepos_t position) case GridTypeBeatDiv2: return 2; case GridTypeNone: return 0; - case GridTypeSmpte: return 0; + case GridTypeTimecode: return 0; case GridTypeMinSec: return 0; case GridTypeCDFrame: return 0; default: return 0; @@ -4031,7 +4031,7 @@ Editor::get_grid_music_divisions (uint32_t event_state) case GridTypeBar : return -1; case GridTypeNone: return 0; - case GridTypeSmpte: return 0; + case GridTypeTimecode: return 0; case GridTypeMinSec: return 0; case GridTypeCDFrame: return 0; } diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index 3dd4fece17..a225a2978a 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -577,9 +577,9 @@ Editor::register_actions () myactions.register_radio_action (snap_actions, grid_choice_group, X_("grid-type-thirds"), grid_type_strings[(int)GridTypeBeatDiv3].c_str(), (sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_chosen), Editing::GridTypeBeatDiv3))); myactions.register_radio_action (snap_actions, grid_choice_group, X_("grid-type-halves"), grid_type_strings[(int)GridTypeBeatDiv2].c_str(), (sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_chosen), Editing::GridTypeBeatDiv2))); - 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-timecode"), grid_type_strings[(int)GridTypeTimecode].c_str(), (sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_chosen), Editing::GridTypeTimecode))); 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-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-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))); @@ -1092,8 +1092,8 @@ Editor::grid_type_action (GridType type) case Editing::GridTypeNone: action = "grid-type-none"; break; - case Editing::GridTypeSmpte: - action = "grid-type-smpte"; + case Editing::GridTypeTimecode: + action = "grid-type-timecode"; break; case Editing::GridTypeCDFrame: action = "grid-type-cdframe"; @@ -1156,7 +1156,7 @@ Editor::next_grid_choice () case Editing::GridTypeBeatDiv7: case Editing::GridTypeBeatDiv14: case Editing::GridTypeBeatDiv28: - case Editing::GridTypeSmpte: + case Editing::GridTypeTimecode: case Editing::GridTypeMinSec: case Editing::GridTypeCDFrame: break; //do nothing @@ -1201,7 +1201,7 @@ Editor::prev_grid_choice () case Editing::GridTypeBeatDiv7: case Editing::GridTypeBeatDiv14: case Editing::GridTypeBeatDiv28: - case Editing::GridTypeSmpte: + case Editing::GridTypeTimecode: case Editing::GridTypeMinSec: case Editing::GridTypeCDFrame: break; //do nothing diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc index c6ef090c79..f78ce6d23a 100644 --- a/gtk2_ardour/editor_rulers.cc +++ b/gtk2_ardour/editor_rulers.cc @@ -1052,7 +1052,7 @@ Editor::compute_bbt_ruler_scale (samplepos_t lower, samplepos_t upper) bbt_beat_subdivision = 4; break; case GridTypeNone: - case GridTypeSmpte: + case GridTypeTimecode: case GridTypeMinSec: case GridTypeCDFrame: bbt_beat_subdivision = 4; diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index 8446ca414b..0cb646be50 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -380,7 +380,7 @@ Editor::maybe_draw_grid_lines () if ( grid_musical() ) { metric_get_bbt (grid_marks, _leftmost_sample, rightmost_sample, 12); - } else if (_grid_type== GridTypeSmpte) { + } else if (_grid_type== GridTypeTimecode) { metric_get_timecode (grid_marks, _leftmost_sample, rightmost_sample, 12); } else if (_grid_type == GridTypeCDFrame) { metric_get_samples (grid_marks, _leftmost_sample, rightmost_sample, 12); diff --git a/gtk2_ardour/enums.cc b/gtk2_ardour/enums.cc index ca1ce57398..55b8c92ffe 100644 --- a/gtk2_ardour/enums.cc +++ b/gtk2_ardour/enums.cc @@ -112,7 +112,7 @@ setup_gtk_ardour_enums () REGISTER_ENUM (GridTypeBeatDiv7); REGISTER_ENUM (GridTypeBeatDiv14); REGISTER_ENUM (GridTypeBeatDiv28); - REGISTER_ENUM (GridTypeSmpte); + REGISTER_ENUM (GridTypeTimecode); REGISTER_ENUM (GridTypeMinSec); REGISTER_ENUM (GridTypeCDFrame); REGISTER (grid_type); -- 2.30.2