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

fix playhead in pianoroll

Browse Source 
Logic had all been messed up by earlier commits
This commit is contained in:
Paul Davis
2025-04-04 16:00:48 -06:00
parent 3b8dcdcc9e
commit 8677ebe1f0
1 changed files with 40 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
gtk2_ardour/pianoroll.cc
View File

@@ -644,42 +644,49 @@ Pianoroll::maybe_update ()
{
ARDOUR::TriggerPtr playing_trigger;
if (_track) {
playing_trigger = _track->triggerbox()->currently_playing ();
}
if (ref.trigger()) {
if (!playing_trigger) {
/* Trigger editor */
if (_drags->active() || !view || !_track || !_track->triggerbox()) {
return;
}
if (_track->triggerbox()->record_enabled() == Recording) {
playing_trigger = ref.box()->currently_playing ();
_playhead_cursor->set_position (data_capture_duration);
if (!playing_trigger) {
} else if (view->midi_region()) {
if (!_session) {
if (_drags->active() || !view || !_track || !_track->triggerbox()) {
return;
}
samplepos_t pos = _session->transport_sample();
samplepos_t spos = view->midi_region()->source_position().samples();
if (pos < spos) {
_playhead_cursor->set_position (0);
} else {
_playhead_cursor->set_position (pos - spos);
if (_track->triggerbox()->record_enabled() == Recording) {
_playhead_cursor->set_position (data_capture_duration);
}
} else {
if (playing_trigger->active ()) {
_playhead_cursor->set_position (playing_trigger->current_pos().samples() + playing_trigger->the_region()->start().samples());
} else {
_playhead_cursor->set_position (0);
}
}
} else if (view->midi_region()) {
/* Timeline region editor */
if (!_session) {
return;
}
samplepos_t pos = _session->transport_sample();
samplepos_t spos = view->midi_region()->source_position().samples();
if (pos < spos) {
_playhead_cursor->set_position (0);
} else {
_playhead_cursor->set_position (pos - spos);
}
} else {
if (playing_trigger->active ()) {
_playhead_cursor->set_position (playing_trigger->current_pos().samples() + playing_trigger->the_region()->start().samples());
} else {
_playhead_cursor->set_position (0);
}
_playhead_cursor->set_position (0);
}
}
@@ -2813,3 +2820,13 @@ Pianoroll::allow_trim_cursors () const
{
return mouse_mode == Editing::MouseContent || mouse_mode == Editing::MouseTimeFX;
}
void
Pianoroll::shift_notes (timepos_t const & t)
{
if (!_view) {
return;
}
_view->shift_notes (t);
}