ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

remove GridTypePlayhead

This commit is contained in:
Ben Loftis 2023-09-08 14:16:23 -05:00
parent d57676b9c7
commit 503e6249f4
4 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/editing_syms.h
View File

@ -22,7 +22,7 @@
/* Changing this order will break the menu */
GRIDTYPE(GridTypeNone)
GRIDTYPE(GridTypePlayhead)
GRIDTYPE(GridTypePlayhead)
GRIDTYPE(GridTypeBar)
GRIDTYPE(GridTypeBeat)
GRIDTYPE(GridTypeBeatDiv2)

14
gtk2_ardour/editor.cc
View File

@ -2243,7 +2243,6 @@ Editor::grid_type_is_musical(GridType gt) const
case GridTypeBar:
return true;
case GridTypeNone:
case GridTypePlayhead:
case GridTypeTimecode:
case GridTypeMinSec:
case GridTypeCDFrame:
@ -3090,7 +3089,6 @@ Editor::_snap_to_bbt (timepos_t const & presnap, Temporal::RoundMode direction,
divisor = 1;
break;
case GridTypeNone:
case GridTypePlayhead:
return ret;
default:
divisor = 2;
@ -3220,11 +3218,6 @@ Editor::snap_to_internal (timepos_t& start, Temporal::RoundMode direction, SnapP
timepos_t dist = timepos_t::max (start.time_domain()); // this records the distance of the best snap result we've found so far
timepos_t best = timepos_t::max (start.time_domain()); // this records the best snap-result we've found so far
if (_grid_type == GridTypePlayhead) {
best = timepos_t (_session->transport_sample ());
goto check_distance;
}
/* check snap-to-marker */
if ((pref == SnapToAny_Visual) && uic.get_snap_to_marks ()) {
test = snap_to_marker (presnap, direction);
@ -3581,10 +3574,12 @@ Editor::build_grid_type_menu ()
{
using namespace Menu_Helpers;
/* main grid: bars, quarter-notes, etc */
/* there's no Grid, but if Snap is engaged, the Snap preferences will be applied */
grid_type_selector.AddMenuElem (MenuElem (grid_type_strings[(int)GridTypeNone], sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_selection_done), (GridType) GridTypeNone)));
grid_type_selector.AddMenuElem(SeparatorElem());
/* musical grid: bars, quarter-notes, etc */
grid_type_selector.AddMenuElem (MenuElem (grid_type_strings[(int)GridTypeBar], sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_selection_done), (GridType) GridTypeBar)));
grid_type_selector.AddMenuElem (MenuElem (grid_type_strings[(int)GridTypePlayhead], sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_selection_done), (GridType) GridTypePlayhead)));
grid_type_selector.AddMenuElem (MenuElem (grid_type_strings[(int)GridTypeBeat], sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_selection_done), (GridType) GridTypeBeat)));
grid_type_selector.AddMenuElem (MenuElem (grid_type_strings[(int)GridTypeBeatDiv2], sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_selection_done), (GridType) GridTypeBeatDiv2)));
grid_type_selector.AddMenuElem (MenuElem (grid_type_strings[(int)GridTypeBeatDiv4], sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_selection_done), (GridType) GridTypeBeatDiv4)));
@ -4461,7 +4456,6 @@ Editor::get_grid_beat_divisions (GridType gt)
case GridTypeBar: return -1;
case GridTypeNone: return 0;
case GridTypePlayhead: return 0;
case GridTypeTimecode: return 0;
case GridTypeMinSec: return 0;
case GridTypeCDFrame: return 0;

15
gtk2_ardour/editor_actions.cc
View File

@ -711,7 +711,6 @@ Editor::register_actions ()
ActionManager::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)));
ActionManager::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)));
ActionManager::register_radio_action (snap_actions, grid_choice_group, X_("grid-type-playhead"), grid_type_strings[(int)GridTypePlayhead].c_str(), (sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_chosen), Editing::GridTypePlayhead)));
ActionManager::register_radio_action (snap_actions, grid_choice_group, X_("grid-type-none"), grid_type_strings[(int)GridTypeNone].c_str(), (sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_chosen), Editing::GridTypeNone)));
@ -1258,9 +1257,6 @@ Editor::draw_length_action (GridType type)
case Editing::GridTypeBar:
action = "draw-length-bar";
break;
case Editing::GridTypePlayhead:
action = "draw-length-playhead";
break;
case Editing::GridTypeNone:
action = "draw-length-auto";
break;
@ -1342,9 +1338,6 @@ Editor::grid_type_action (GridType type)
case Editing::GridTypeBar:
action = "grid-type-bar";
break;
case Editing::GridTypePlayhead:
action = "grid-type-playhead";
break;
case Editing::GridTypeNone:
action = "grid-type-none";
break;
@ -1400,9 +1393,6 @@ Editor::next_grid_choice ()
set_grid_to (Editing::GridTypeBeat);
break;
case Editing::GridTypeNone:
set_grid_to (Editing::GridTypePlayhead);
break;
case Editing::GridTypePlayhead:
set_grid_to (Editing::GridTypeBar);
break;
case Editing::GridTypeBeatDiv3:
@ -1445,10 +1435,7 @@ Editor::prev_grid_choice ()
set_grid_to (Editing::GridTypeBar);
break;
case Editing::GridTypeBar:
set_grid_to (Editing::GridTypePlayhead);
break;
case Editing::GridTypePlayhead:
set_grid_to (Editing::GridTypeBar);
set_grid_to (Editing::GridTypeNone);
break;
case Editing::GridTypeNone:
set_grid_to (Editing::GridTypeBeatDiv32);

6
gtk2_ardour/enums.cc
View File

@ -105,7 +105,6 @@ setup_gtk_ardour_enums ()
REGISTER (region_list_sort_type);
REGISTER_ENUM (GridTypeNone);
REGISTER_ENUM (GridTypePlayhead);
REGISTER_ENUM (GridTypeBar);
REGISTER_ENUM (GridTypeBeat);
REGISTER_ENUM (GridTypeBeatDiv2);
@ -128,6 +127,11 @@ setup_gtk_ardour_enums ()
REGISTER_ENUM (GridTypeCDFrame);
REGISTER (grid_type);
/*
* GridTypePlayhead was not intended to get into the wild
*/
enum_writer.add_to_hack_table ("GridTypePlayhead", "GridTypeNone");
REGISTER_ENUM (SnapOff);
REGISTER_ENUM (SnapNormal);
REGISTER_ENUM (SnapMagnetic);