projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor so that all the locate-related stuff in CursorDrag is in one method. Also...
[ardour.git]
/
gtk2_ardour
/
step_editor.cc
diff --git
a/gtk2_ardour/step_editor.cc
b/gtk2_ardour/step_editor.cc
index 5e7969bb3a794e608fe4b3521c31223adcdd0176..079644eabc1d28e2b1caae93f7d830456575e65e 100644
(file)
--- a/
gtk2_ardour/step_editor.cc
+++ b/
gtk2_ardour/step_editor.cc
@@
-158,14
+158,14
@@
StepEditor::stop_step_editing ()
void
StepEditor::check_step_edit ()
{
void
StepEditor::check_step_edit ()
{
- MidiRingBuffer<
nframe
s_t>& incoming (_track->step_edit_ring_buffer());
+ MidiRingBuffer<
framepo
s_t>& incoming (_track->step_edit_ring_buffer());
uint8_t* buf;
uint32_t bufsize = 32;
buf = new uint8_t[bufsize];
while (incoming.read_space()) {
uint8_t* buf;
uint32_t bufsize = 32;
buf = new uint8_t[bufsize];
while (incoming.read_space()) {
-
nframe
s_t time;
+
framepo
s_t time;
Evoral::EventType type;
uint32_t size;
Evoral::EventType type;
uint32_t size;
@@
-273,8
+273,8
@@
StepEditor::step_add_note (uint8_t channel, uint8_t pitch, uint8_t velocity, Evo
up by 1 tick from where the last note ended
*/
up by 1 tick from where the last note ended
*/
- at += 1.0/
Meter
::ticks_per_beat;
- len -= 1.0/
Meter
::ticks_per_beat;
+ at += 1.0/
Timecode::BBT_Time
::ticks_per_beat;
+ len -= 1.0/
Timecode::BBT_Time
::ticks_per_beat;
}
step_edit_region_view->step_add_note (channel, pitch, velocity, at, len);
}
step_edit_region_view->step_add_note (channel, pitch, velocity, at, len);
@@
-294,7
+294,7
@@
StepEditor::step_add_note (uint8_t channel, uint8_t pitch, uint8_t velocity, Evo
step_edit_beat_pos += beat_duration;
step_edit_region_view->move_step_edit_cursor (step_edit_beat_pos);
} else {
step_edit_beat_pos += beat_duration;
step_edit_region_view->move_step_edit_cursor (step_edit_beat_pos);
} else {
- step_edit_beat_pos += 1.0/
Meter
::ticks_per_beat; // tiny, but no longer overlapping
+ step_edit_beat_pos += 1.0/
Timecode::BBT_Time
::ticks_per_beat; // tiny, but no longer overlapping
_step_edit_chord_duration = max (_step_edit_chord_duration, beat_duration);
}
_step_edit_chord_duration = max (_step_edit_chord_duration, beat_duration);
}