diff options
| author | David Robillard <d@drobilla.net> | 2009-10-23 02:49:12 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2009-10-23 02:49:12 +0000 |
| commit | c78108a033cccd694cd7e0ee3e2ca70d2e489767 (patch) | |
| tree | 8eade3d286cc02400c1cc31679375714e0d7d6a3 | |
| parent | 8d03d338d8687f5f99ceaaec18d573d9f3a674fb (diff) | |
Fix yet more crazy tabs.
git-svn-id: svn://localhost/ardour2/branches/3.0@5881 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | libs/evoral/evoral/MIDIEvent.hpp | 4 | ||||
| -rw-r--r-- | libs/evoral/evoral/types.hpp | 2 | ||||
| -rw-r--r-- | libs/evoral/src/ControlList.cpp | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/libs/evoral/evoral/MIDIEvent.hpp b/libs/evoral/evoral/MIDIEvent.hpp index fee07a41d7..c06a323d73 100644 --- a/libs/evoral/evoral/MIDIEvent.hpp +++ b/libs/evoral/evoral/MIDIEvent.hpp @@ -69,8 +69,8 @@ struct MIDIEvent : public Event<Time> { inline bool is_channel_pressure() const { return (type() == MIDI_CMD_CHANNEL_PRESSURE); } inline uint8_t note() const { return (this->_buf[1]); } inline uint8_t velocity() const { return (this->_buf[2]); } - inline void set_velocity(uint8_t value) { this->_buf[2] = value; } - inline void scale_velocity(float factor) { + inline void set_velocity(uint8_t value) { this->_buf[2] = value; } + inline void scale_velocity(float factor) { if (factor < 0) factor = 0; this->_buf[2] = (uint8_t) lrintf (this->_buf[2]*factor); if (this->_buf[2] > 127) this->_buf[2] = 127; diff --git a/libs/evoral/evoral/types.hpp b/libs/evoral/evoral/types.hpp index 06f29b341e..2ba5ba86cb 100644 --- a/libs/evoral/evoral/types.hpp +++ b/libs/evoral/evoral/types.hpp @@ -32,7 +32,7 @@ typedef uint32_t FrameTime; typedef double MusicalTime; static inline bool musical_time_equal (MusicalTime a, MusicalTime b) { - /* acceptable tolerance is 1 tick. Nice if there was no magic number here */ + /* acceptable tolerance is 1 tick. Nice if there was no magic number here */ return fabs (a - b) <= (1.0/1920.0); } diff --git a/libs/evoral/src/ControlList.cpp b/libs/evoral/src/ControlList.cpp index bb348625e6..fb8f88ecba 100644 --- a/libs/evoral/src/ControlList.cpp +++ b/libs/evoral/src/ControlList.cpp @@ -375,7 +375,7 @@ ControlList::reset_range (double start, double endt) bool reset = false; { - Glib::Mutex::Lock lm (_lock); + Glib::Mutex::Lock lm (_lock); ControlEvent cp (start, 0.0f); iterator s; iterator e; @@ -791,7 +791,7 @@ ControlList::unlocked_eval (double x) const case 2: if (x >= _events.back()->when) { return _events.back()->value; - } else if (x <= _events.front()->when) { + } else if (x <= _events.front()->when) { return _events.front()->value; } @@ -811,7 +811,7 @@ ControlList::unlocked_eval (double x) const default: if (x >= _events.back()->when) { return _events.back()->value; - } else if (x <= _events.front()->when) { + } else if (x <= _events.front()->when) { return _events.front()->value; } |