summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor.cc
diff options
context:
space:
mode:
Diffstat (limited to 'gtk2_ardour/editor.cc')
-rw-r--r--gtk2_ardour/editor.cc12
1 files changed, 6 insertions, 6 deletions
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;
}