allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

move some methods from Editor to Editing context so that drawing controls work everywhere

Browse Source
This commit is contained in:
Paul Davis
2024-08-24 16:43:19 -06:00
parent fa79645c19
commit 45e4b97a6f
5 changed files with 144 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

138
gtk2_ardour/editing_context.cc
View File

@@ -2508,3 +2508,141 @@ EditingContext::update_undo_redo_actions (PBD::UndoHistory const & history)
redo_action->property_label() = label;
}
}
int32_t
EditingContext::get_grid_beat_divisions (GridType gt) const
{
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;
default: return 0;
}
return 0;
}
/**
* Return the musical grid divisions
*
* @param event_state the current keyboard modifier mask.
* @return Music grid beat divisions
*/
int32_t
EditingContext::get_grid_music_divisions (Editing::GridType gt, uint32_t event_state) const
{
return get_grid_beat_divisions (gt);
}
Temporal::Beats
EditingContext::get_grid_type_as_beats (bool& success, timepos_t const & position) const
{
success = true;
int32_t const divisions = get_grid_beat_divisions (_grid_type);
/* Beat (+1), and Bar (-1) are handled below */
if (divisions > 1) {
/* grid divisions are divisions of a 1/4 note */
return Temporal::Beats::ticks(Temporal::Beats::PPQN / divisions);
}
TempoMap::SharedPtr tmap (TempoMap::use());
switch (_grid_type) {
case GridTypeBar:
if (_session) {
const Meter& m = tmap->meter_at (position);
return Temporal::Beats::from_double ((4.0 * m.divisions_per_bar()) / m.note_value());
}
break;
case GridTypeBeat:
return Temporal::Beats::from_double (tmap->meter_at (position).note_value() / 4.0);
case GridTypeBeatDiv2:
return Temporal::Beats::from_double (tmap->meter_at (position).note_value() / 8.0);
case GridTypeBeatDiv4:
return Temporal::Beats::from_double (tmap->meter_at (position).note_value() / 16.0);
case GridTypeBeatDiv8:
return Temporal::Beats::from_double (tmap->meter_at (position).note_value() / 32.0);
case GridTypeBeatDiv16:
return Temporal::Beats::from_double (tmap->meter_at (position).note_value() / 64.0);
case GridTypeBeatDiv32:
return Temporal::Beats::from_double (tmap->meter_at (position).note_value() / 128.0);
case GridTypeBeatDiv3: //Triplet eighth
return Temporal::Beats::from_double (tmap->meter_at (position).note_value() / 12.0);
case GridTypeBeatDiv6:
return Temporal::Beats::from_double (tmap->meter_at (position).note_value() / 24.0);
case GridTypeBeatDiv12:
return Temporal::Beats::from_double (tmap->meter_at (position).note_value() / 48.0);
case GridTypeBeatDiv24:
return Temporal::Beats::from_double (tmap->meter_at (position).note_value() / 96.0);
case GridTypeBeatDiv5: //Quintuplet //eighth
return Temporal::Beats::from_double (tmap->meter_at (position).note_value() / 20.0);
case GridTypeBeatDiv10:
return Temporal::Beats::from_double (tmap->meter_at (position).note_value() / 40.0);
case GridTypeBeatDiv20:
return Temporal::Beats::from_double (tmap->meter_at (position).note_value() / 80.0);
case GridTypeBeatDiv7: //Septuplet eighth
return Temporal::Beats::from_double (tmap->meter_at (position).note_value() / 28.0);
case GridTypeBeatDiv14:
return Temporal::Beats::from_double (tmap->meter_at (position).note_value() / 56.0);
case GridTypeBeatDiv28:
return Temporal::Beats::from_double (tmap->meter_at (position).note_value() / 112.0);
default:
success = false;
break;
}
return Temporal::Beats();
}
Temporal::Beats
EditingContext::get_draw_length_as_beats (bool& success, timepos_t const & position) const
{
success = true;
GridType grid_to_use = draw_length() == DRAW_LEN_AUTO ? grid_type() : draw_length();
int32_t const divisions = get_grid_beat_divisions (grid_to_use);
if (divisions != 0) {
return Temporal::Beats::ticks (Temporal::Beats::PPQN / divisions);
}
success = false;
return Temporal::Beats();
}

8
gtk2_ardour/editing_context.h
View File

@@ -255,11 +255,11 @@ class EditingContext : public ARDOUR::SessionHandlePtr, public AxisViewProvider
virtual bool canvas_note_event (GdkEvent* event, ArdourCanvas::Item*) = 0;
virtual Temporal::Beats get_grid_type_as_beats (bool& success, Temporal::timepos_t const & position) const = 0;
virtual Temporal::Beats get_draw_length_as_beats (bool& success, Temporal::timepos_t const & position) const = 0;
Temporal::Beats get_grid_type_as_beats (bool& success, Temporal::timepos_t const & position) const;
Temporal::Beats get_draw_length_as_beats (bool& success, Temporal::timepos_t const & position) const;
virtual int32_t get_grid_beat_divisions (Editing::GridType gt) const = 0;
virtual int32_t get_grid_music_divisions (Editing::GridType gt, uint32_t event_state) const = 0;
int32_t get_grid_beat_divisions (Editing::GridType gt) const;
int32_t get_grid_music_divisions (Editing::GridType gt, uint32_t event_state) const;
Editing::GridType grid_type () const;
bool grid_type_is_musical (Editing::GridType) const;

137
gtk2_ardour/editor.cc
View File

@@ -3540,143 +3540,6 @@ Editor::get_paste_offset (Temporal::timepos_t const & pos, unsigned paste_count,
return pos.distance (snap_pos);
}
int32_t
Editor::get_grid_beat_divisions (GridType gt) const
{
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;
default: return 0;
}
return 0;
}
/**
* Return the musical grid divisions
*
* @param event_state the current keyboard modifier mask.
* @return Music grid beat divisions
*/
int32_t
Editor::get_grid_music_divisions (Editing::GridType gt, uint32_t event_state) const
{
return get_grid_beat_divisions (gt);
}
Temporal::Beats
Editor::get_grid_type_as_beats (bool& success, timepos_t const & position) const
{
success = true;
int32_t const divisions = get_grid_beat_divisions (_grid_type);
/* Beat (+1), and Bar (-1) are handled below */
if (divisions > 1) {
/* grid divisions are divisions of a 1/4 note */
return Temporal::Beats::ticks(Temporal::Beats::PPQN / divisions);
}
TempoMap::SharedPtr tmap (TempoMap::use());
switch (_grid_type) {
case GridTypeBar:
if (_session) {
const Meter& m = tmap->meter_at (position);
return Temporal::Beats::from_double ((4.0 * m.divisions_per_bar()) / m.note_value());
}
break;
case GridTypeBeat:
return Temporal::Beats::from_double (tmap->meter_at (position).note_value() / 4.0);
case GridTypeBeatDiv2:
return Temporal::Beats::from_double (tmap->meter_at (position).note_value() / 8.0);
case GridTypeBeatDiv4:
return Temporal::Beats::from_double (tmap->meter_at (position).note_value() / 16.0);
case GridTypeBeatDiv8:
return Temporal::Beats::from_double (tmap->meter_at (position).note_value() / 32.0);
case GridTypeBeatDiv16:
return Temporal::Beats::from_double (tmap->meter_at (position).note_value() / 64.0);
case GridTypeBeatDiv32:
return Temporal::Beats::from_double (tmap->meter_at (position).note_value() / 128.0);
case GridTypeBeatDiv3: //Triplet eighth
return Temporal::Beats::from_double (tmap->meter_at (position).note_value() / 12.0);
case GridTypeBeatDiv6:
return Temporal::Beats::from_double (tmap->meter_at (position).note_value() / 24.0);
case GridTypeBeatDiv12:
return Temporal::Beats::from_double (tmap->meter_at (position).note_value() / 48.0);
case GridTypeBeatDiv24:
return Temporal::Beats::from_double (tmap->meter_at (position).note_value() / 96.0);
case GridTypeBeatDiv5: //Quintuplet //eighth
return Temporal::Beats::from_double (tmap->meter_at (position).note_value() / 20.0);
case GridTypeBeatDiv10:
return Temporal::Beats::from_double (tmap->meter_at (position).note_value() / 40.0);
case GridTypeBeatDiv20:
return Temporal::Beats::from_double (tmap->meter_at (position).note_value() / 80.0);
case GridTypeBeatDiv7: //Septuplet eighth
return Temporal::Beats::from_double (tmap->meter_at (position).note_value() / 28.0);
case GridTypeBeatDiv14:
return Temporal::Beats::from_double (tmap->meter_at (position).note_value() / 56.0);
case GridTypeBeatDiv28:
return Temporal::Beats::from_double (tmap->meter_at (position).note_value() / 112.0);
default:
success = false;
break;
}
return Temporal::Beats();
}
Temporal::Beats
Editor::get_draw_length_as_beats (bool& success, timepos_t const & position) const
{
success = true;
GridType grid_to_use = draw_length() == DRAW_LEN_AUTO ? grid_type() : draw_length();
int32_t const divisions = get_grid_beat_divisions (grid_to_use);
if (divisions != 0) {
return Temporal::Beats::ticks (Temporal::Beats::PPQN / divisions);
}
success = false;
return Temporal::Beats();
}
timecnt_t
Editor::get_nudge_distance (timepos_t const & pos, timecnt_t& next) const
{

6
gtk2_ardour/editor.h
View File

@@ -311,12 +311,6 @@ public:
Temporal::timecnt_t get_nudge_distance (Temporal::timepos_t const & pos, Temporal::timecnt_t& next) const;
Temporal::timecnt_t get_paste_offset (Temporal::timepos_t const & pos, unsigned paste_count, Temporal::timecnt_t const & duration);
Temporal::Beats get_grid_type_as_beats (bool& success, Temporal::timepos_t const & position) const;
Temporal::Beats get_draw_length_as_beats (bool& success, Temporal::timepos_t const & position) const;
int32_t get_grid_beat_divisions (Editing::GridType gt) const;
int32_t get_grid_music_divisions (Editing::GridType gt, uint32_t event_state) const;
void nudge_forward (bool next, bool force_playhead);
void nudge_backward (bool next, bool force_playhead);

4
gtk2_ardour/midi_cue_editor.h
View File

@@ -62,8 +62,8 @@ class MidiCueEditor : public CueEditor
void get_per_region_note_selection (std::list<std::pair<PBD::ID, std::set<std::shared_ptr<Evoral::Note<Temporal::Beats> > > > >&) const {}
Temporal::Beats get_grid_type_as_beats (bool& success, Temporal::timepos_t const & position) const { return Temporal::Beats (1, 0); }
Temporal::Beats get_draw_length_as_beats (bool& success, Temporal::timepos_t const & position) const { return Temporal::Beats (1, 0); }
Temporal::Beats get_grid_type_as_beats (bool& success, Temporal::timepos_t const & position) const;
Temporal::Beats get_draw_length_as_beats (bool& success, Temporal::timepos_t const & position) const;
bool canvas_note_event (GdkEvent* event, ArdourCanvas::Item*);