L: force grid type to timecode
This commit is contained in:
parent
e9013e1d0f
commit
53236dd728
@ -365,7 +365,11 @@ Editor::Editor ()
|
|||||||
, select_new_marker (false)
|
, select_new_marker (false)
|
||||||
, have_pending_keyboard_selection (false)
|
, have_pending_keyboard_selection (false)
|
||||||
, pending_keyboard_selection_start (0)
|
, pending_keyboard_selection_start (0)
|
||||||
|
#ifdef LIVETRAX
|
||||||
|
, _grid_type (GridTypeTimecode)
|
||||||
|
#else
|
||||||
, _grid_type (GridTypeBeat)
|
, _grid_type (GridTypeBeat)
|
||||||
|
#endif
|
||||||
, _snap_mode (SnapOff)
|
, _snap_mode (SnapOff)
|
||||||
, _draw_length (GridTypeNone)
|
, _draw_length (GridTypeNone)
|
||||||
, _draw_velocity (DRAW_VEL_AUTO)
|
, _draw_velocity (DRAW_VEL_AUTO)
|
||||||
@ -2482,6 +2486,9 @@ Editor::set_draw_channel_to (int c)
|
|||||||
void
|
void
|
||||||
Editor::set_grid_to (GridType gt)
|
Editor::set_grid_to (GridType gt)
|
||||||
{
|
{
|
||||||
|
#ifdef LIVETRAX
|
||||||
|
gt = GridTypeTimecode;
|
||||||
|
#endif
|
||||||
unsigned int grid_ind = (unsigned int)gt;
|
unsigned int grid_ind = (unsigned int)gt;
|
||||||
|
|
||||||
if (internal_editing() && UIConfiguration::instance().get_grid_follows_internal()) {
|
if (internal_editing() && UIConfiguration::instance().get_grid_follows_internal()) {
|
||||||
@ -2691,8 +2698,14 @@ Editor::set_state (const XMLNode& node, int version)
|
|||||||
set_snap_mode (_snap_mode);
|
set_snap_mode (_snap_mode);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef LIVETRAX
|
||||||
|
_grid_type = GridTypeTimecode;
|
||||||
|
internal_grid_type = GridTypeTimecode;
|
||||||
|
pre_internal_grid_type = GridTypeTimecode;
|
||||||
|
#else
|
||||||
node.get_property ("internal-grid-type", internal_grid_type);
|
node.get_property ("internal-grid-type", internal_grid_type);
|
||||||
node.get_property ("internal-snap-mode", internal_snap_mode);
|
node.get_property ("internal-snap-mode", internal_snap_mode);
|
||||||
|
#endif
|
||||||
node.get_property ("pre-internal-grid-type", pre_internal_grid_type);
|
node.get_property ("pre-internal-grid-type", pre_internal_grid_type);
|
||||||
node.get_property ("pre-internal-snap-mode", pre_internal_snap_mode);
|
node.get_property ("pre-internal-snap-mode", pre_internal_snap_mode);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user