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

Consolidate get_grid_beat/music_divisions 

This fixes "snap to bar" which previously snapped to beats
This commit is contained in:
Robin Gareus 2022-03-04 17:51:21 +01:00
parent bc1be2fc24
commit 90770a2788
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
3 changed files with 11 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
gtk2_ardour/editor.cc
View File

@ -4219,7 +4219,7 @@ Editor::get_paste_offset (Temporal::timepos_t const & pos, unsigned paste_count,
return pos.distance (snap_pos);
}
unsigned
int32_t
Editor::get_grid_beat_divisions (GridType gt)
{
switch (gt) {
@ -4239,7 +4239,7 @@ Editor::get_grid_beat_divisions (GridType gt)
case GridTypeBeatDiv3: return 3;
case GridTypeBeatDiv2: return 2;
case GridTypeBeat: return 1;
case GridTypeBar: return 1;
case GridTypeBar: return -1;
case GridTypeNone: return 0;
case GridTypeTimecode: return 0;
@ -4266,31 +4266,7 @@ Editor::get_grid_music_divisions (Editing::GridType gt, uint32_t event_state)
return 0;
}
switch (gt) {
case GridTypeBeatDiv32: return 32;
case GridTypeBeatDiv28: return 28;
case GridTypeBeatDiv24: return 24;
case GridTypeBeatDiv20: return 20;
case GridTypeBeatDiv16: return 16;
case GridTypeBeatDiv14: return 14;
case GridTypeBeatDiv12: return 12;
case GridTypeBeatDiv10: return 10;
case GridTypeBeatDiv8: return 8;
case GridTypeBeatDiv7: return 7;
case GridTypeBeatDiv6: return 6;
case GridTypeBeatDiv5: return 5;
case GridTypeBeatDiv4: return 4;
case GridTypeBeatDiv3: return 3;
case GridTypeBeatDiv2: return 2;
case GridTypeBeat: return 1;
case GridTypeBar : return -1;
case GridTypeNone: return 0;
case GridTypeTimecode: return 0;
case GridTypeMinSec: return 0;
case GridTypeCDFrame: return 0;
}
return 0;
return get_grid_beat_divisions (gt);
}
Temporal::Beats
@ -4298,8 +4274,9 @@ Editor::get_grid_type_as_beats (bool& success, timepos_t const & position)
{
success = true;
const unsigned divisions = get_grid_beat_divisions (_grid_type);
if (divisions) {
int32_t const divisions = get_grid_beat_divisions (_grid_type);
/* Beat (+1), and Bar (-1) are handled below */
if (divisions > 1) {
return Temporal::Beats::from_double (1.0 / (double) divisions);
}
@ -4329,9 +4306,9 @@ Editor::get_draw_length_as_beats (bool& success, timepos_t const & position)
success = true;
GridType grid_to_use = draw_length() == DRAW_LEN_AUTO ? grid_type() : draw_length();
const unsigned divisions = get_grid_beat_divisions (grid_to_use);
if (divisions) {
return Temporal::Beats::from_double (1.0 / (double) divisions);
int32_t const divisions = get_grid_beat_divisions (grid_to_use);
if (divisions != 0) {
return Temporal::Beats::from_double (1.0 / fabs (divisions));
}
success = false;

2
gtk2_ardour/editor.h
View File

@ -375,7 +375,7 @@ public:
Temporal::Beats get_grid_type_as_beats (bool& success, Temporal::timepos_t const & position);
Temporal::Beats get_draw_length_as_beats (bool& success, Temporal::timepos_t const & position);
unsigned get_grid_beat_divisions (Editing::GridType gt);
int32_t get_grid_beat_divisions (Editing::GridType gt);
int32_t get_grid_music_divisions (Editing::GridType gt, uint32_t event_state);
void nudge_forward (bool next, bool force_playhead);

2
gtk2_ardour/public_editor.h
View File

@ -385,7 +385,7 @@ public:
virtual int draw_velocity () const = 0;
virtual int draw_channel () const = 0;
virtual unsigned get_grid_beat_divisions (Editing::GridType gt) = 0;
virtual int32_t get_grid_beat_divisions (Editing::GridType gt) = 0;
virtual int32_t get_grid_music_divisions (Editing::GridType gt, uint32_t event_state) = 0;
virtual void edit_notes (MidiRegionView*) = 0;