diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2015-10-04 15:11:15 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-10-04 15:11:15 -0400 |
commit | 4178db5f632721eefb58c42d684fc10f8f4fb9da (patch) | |
tree | a549de293b1a4dd6b5c3f5070f44f95e5e829f46 /libs/evoral | |
parent | 4dc63966f0872efe768dad61eb9b8785d06b92d1 (diff) |
globally remove all trailing whitespace from .cpp and .hpp files missed by previous commit
Diffstat (limited to 'libs/evoral')
-rw-r--r-- | libs/evoral/evoral/MIDIEvent.hpp | 2 | ||||
-rw-r--r-- | libs/evoral/src/ControlList.cpp | 14 | ||||
-rw-r--r-- | libs/evoral/src/Event.cpp | 10 | ||||
-rw-r--r-- | libs/evoral/test/CurveTest.cpp | 2 |
4 files changed, 14 insertions, 14 deletions
diff --git a/libs/evoral/evoral/MIDIEvent.hpp b/libs/evoral/evoral/MIDIEvent.hpp index f0c9c74589..00e8577cda 100644 --- a/libs/evoral/evoral/MIDIEvent.hpp +++ b/libs/evoral/evoral/MIDIEvent.hpp @@ -101,7 +101,7 @@ public: inline bool is_spp() const { return this->_buf[0] == 0xF2 && this->size() == 1; } inline bool is_mtc_quarter() const { return this->_buf[0] == 0xF1 && this->size() == 1; } inline bool is_mtc_full() const { - return this->size() == 10 && this->_buf[0] == 0xf0 && this->_buf[1] == 0x7f && + return this->size() == 10 && this->_buf[0] == 0xf0 && this->_buf[1] == 0x7f && this->_buf[3] == 0x01 && this->_buf[4] == 0x01; } diff --git a/libs/evoral/src/ControlList.cpp b/libs/evoral/src/ControlList.cpp index 5118744c05..0755bd27d2 100644 --- a/libs/evoral/src/ControlList.cpp +++ b/libs/evoral/src/ControlList.cpp @@ -288,8 +288,8 @@ ControlList::thin (double thinning_factor) /* compute the area of the triangle formed by 3 points */ - double area = fabs ((prevprev->when * (prev->value - cur->value)) + - (prev->when * (cur->value - prevprev->value)) + + double area = fabs ((prevprev->when * (prev->value - cur->value)) + + (prev->when * (cur->value - prevprev->value)) + (cur->when * (prevprev->value - prev->value))); if (area < thinning_factor) { @@ -413,11 +413,11 @@ ControlList::add_guard_point (double when) /* most_recent_insert_iterator points to a control event already at the insert position, so there is nothing to do. - - ... except ... + + ... except ... advance most_recent_insert_iterator so that the "real" - insert occurs in the right place, since it + insert occurs in the right place, since it points to the control event just inserted. */ @@ -427,13 +427,13 @@ ControlList::add_guard_point (double when) /* insert a new control event at the right spot */ - DEBUG_TRACE (DEBUG::ControlList, string_compose ("@%1 insert eval-value %2 just before iterator @ %3\n", + DEBUG_TRACE (DEBUG::ControlList, string_compose ("@%1 insert eval-value %2 just before iterator @ %3\n", this, eval_value, (*most_recent_insert_iterator)->when)); most_recent_insert_iterator = _events.insert (most_recent_insert_iterator, new ControlEvent (when, eval_value)); /* advance most_recent_insert_iterator so that the "real" - * insert occurs in the right place, since it + * insert occurs in the right place, since it * points to the control event just inserted. */ diff --git a/libs/evoral/src/Event.cpp b/libs/evoral/src/Event.cpp index 680f488596..a1dc24ff0d 100644 --- a/libs/evoral/src/Event.cpp +++ b/libs/evoral/src/Event.cpp @@ -26,13 +26,13 @@ static event_id_t _event_id_counter = 0; event_id_t event_id_counter() { - return g_atomic_int_get (&_event_id_counter); + return g_atomic_int_get (&_event_id_counter); } -void -init_event_id_counter(event_id_t n) -{ - g_atomic_int_set (&_event_id_counter, n); +void +init_event_id_counter(event_id_t n) +{ + g_atomic_int_set (&_event_id_counter, n); } event_id_t diff --git a/libs/evoral/test/CurveTest.cpp b/libs/evoral/test/CurveTest.cpp index 0cf51ec8ff..e7634f3602 100644 --- a/libs/evoral/test/CurveTest.cpp +++ b/libs/evoral/test/CurveTest.cpp @@ -334,7 +334,7 @@ CurveTest::constrainedCubic () f"2(x2) = 2*(2*f'2(x2) + f'2(x1))/(x2 – x1) - 6*(y2 – y1)/ (x2 – x1)^2 = 2*(2*0 + 1.8181)/(30 – 10) – 6*(150 – 130)/(30 – 10)^2 = -0.11818 - + d2 = 1/6 * (f"2(x2) - f"2(x1))/(x2 – x1) = 1/6 * (-0.11818 + 0.063636)/(30 – 10) = -0.0004545 |