smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-29 00:13:10 +01:00
Code Issues Projects Releases Wiki Activity

Rename SMPTE enum back to Timecode.

Browse source
This commit is contained in:
Ben Loftis 2018-02-26 18:38:18 -06:00
parent 22819b8d2f
commit e1b380b302
6 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/editing_syms.h
View file

@ -36,7 +36,7 @@ GRIDTYPE(GridTypeBeatDiv20)
GRIDTYPE(GridTypeBeatDiv7) //Septuplet eighths
GRIDTYPE(GridTypeBeatDiv14)
GRIDTYPE(GridTypeBeatDiv28)
GRIDTYPE(GridTypeSmpte)
GRIDTYPE(GridTypeTimecode)
GRIDTYPE(GridTypeMinSec)
GRIDTYPE(GridTypeCDFrame)

12
gtk2_ardour/editor.cc
View file

@ -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;
}

12
gtk2_ardour/editor_actions.cc
View file

@ -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

2
gtk2_ardour/editor_rulers.cc
View file

@ -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;

2
gtk2_ardour/editor_tempodisplay.cc
View file

@ -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);

2
gtk2_ardour/enums.cc
View file

@ -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);