aboutsummaryrefslogtreecommitdiffstats
path: root/src/engine/MachineBuilder.cpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2013-01-12 05:51:44 +0000
committerDavid Robillard <d@drobilla.net>2013-01-12 05:51:44 +0000
commit6d3f652624c18d960dbe34d65e333186b2dfd90a (patch)
treedd1fdbb3d29210773a35a64e49f8981a2898dffe /src/engine/MachineBuilder.cpp
parent3608cf1123c28e960892da7b38b4249efdd5e4aa (diff)
downloadmachina-6d3f652624c18d960dbe34d65e333186b2dfd90a.tar.gz
machina-6d3f652624c18d960dbe34d65e333186b2dfd90a.tar.bz2
machina-6d3f652624c18d960dbe34d65e333186b2dfd90a.zip
Fix node times when importing MIDI.
git-svn-id: http://svn.drobilla.net/lad/trunk/machina@4934 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/engine/MachineBuilder.cpp')
-rw-r--r--src/engine/MachineBuilder.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/engine/MachineBuilder.cpp b/src/engine/MachineBuilder.cpp
index 8bdd5d4..bb8f7c2 100644
--- a/src/engine/MachineBuilder.cpp
+++ b/src/engine/MachineBuilder.cpp
@@ -73,7 +73,7 @@ MachineBuilder::set_node_duration(SharedPtr<Node> node,
Raul::TimeStamp q_dur = quantize(TimeStamp(d.unit(), _quantization), d);
// Never quantize a note to duration 0
- if (q_dur.is_zero() && ( node->enter_action() || node->exit_action() )) {
+ if (q_dur.is_zero() && (node->enter_action() || node->exit_action())) {
q_dur = _quantization; // Round up
}
node->set_duration(q_dur);
@@ -223,9 +223,9 @@ MachineBuilder::event(Raul::TimeStamp time_offset,
// Trim useless delay node if possible (these appear after poly sections)
if (is_delay_node(_connect_node)
&& _connect_node->duration().is_zero()
- && ( _connect_node->edges().size() == 1)
- && ( (*_connect_node->edges().begin())->head() ==
- resolved) ) {
+ && (_connect_node->edges().size() == 1)
+ && ((*_connect_node->edges().begin())->head() ==
+ resolved)) {
_connect_node->edges().clear();
assert(_connect_node->edges().empty());
@@ -290,8 +290,8 @@ MachineBuilder::resolve()
const size_t ev_size = action->event_size();
const unsigned char* ev = action->event();
- if (( ev_size == 3)
- && ( (ev[0] & 0xF0) == LV2_MIDI_MSG_NOTE_ON) ) {
+ if (ev_size == 3 &&
+ (ev[0] & 0xF0) == LV2_MIDI_MSG_NOTE_ON) {
unsigned char note_off[3]
= { ((LV2_MIDI_MSG_NOTE_OFF & 0xF0) | (ev[0] & 0x0F)),
ev[1],