smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 23:35:03 +01:00
Code Issues Projects Releases Wiki Activity

Fix yet more crazy tabs.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@5881 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2009-10-23 02:49:12 +00:00
parent 8d03d338d8
commit c78108a033
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libs/evoral/evoral/MIDIEvent.hpp
View file

@ -69,8 +69,8 @@ struct MIDIEvent : public Event<Time> {
inline bool is_channel_pressure() const { return (type() == MIDI_CMD_CHANNEL_PRESSURE); } inline bool is_channel_pressure() const { return (type() == MIDI_CMD_CHANNEL_PRESSURE); }
inline uint8_t note() const { return (this->_buf[1]); } inline uint8_t note() const { return (this->_buf[1]); }
inline uint8_t velocity() const { return (this->_buf[2]); } inline uint8_t velocity() const { return (this->_buf[2]); }
inline void set_velocity(uint8_t value) { this->_buf[2] = value; } inline void set_velocity(uint8_t value) { this->_buf[2] = value; }
inline void scale_velocity(float factor) { inline void scale_velocity(float factor) {
if (factor < 0) factor = 0; if (factor < 0) factor = 0;
this->_buf[2] = (uint8_t) lrintf (this->_buf[2]*factor); this->_buf[2] = (uint8_t) lrintf (this->_buf[2]*factor);
if (this->_buf[2] > 127) this->_buf[2] = 127; if (this->_buf[2] > 127) this->_buf[2] = 127;

2
libs/evoral/evoral/types.hpp
View file

@ -32,7 +32,7 @@ typedef uint32_t FrameTime;
typedef double MusicalTime; typedef double MusicalTime;
static inline bool musical_time_equal (MusicalTime a, MusicalTime b) { 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); return fabs (a - b) <= (1.0/1920.0);
} }

6
libs/evoral/src/ControlList.cpp
View file

@ -375,7 +375,7 @@ ControlList::reset_range (double start, double endt)
bool reset = false; bool reset = false;
{ {
Glib::Mutex::Lock lm (_lock); Glib::Mutex::Lock lm (_lock);
ControlEvent cp (start, 0.0f); ControlEvent cp (start, 0.0f);
iterator s; iterator s;
iterator e; iterator e;
@ -791,7 +791,7 @@ ControlList::unlocked_eval (double x) const
case 2: case 2:
if (x >= _events.back()->when) { if (x >= _events.back()->when) {
return _events.back()->value; return _events.back()->value;
} else if (x <= _events.front()->when) { } else if (x <= _events.front()->when) {
return _events.front()->value; return _events.front()->value;
} }
@ -811,7 +811,7 @@ ControlList::unlocked_eval (double x) const
default: default:
if (x >= _events.back()->when) { if (x >= _events.back()->when) {
return _events.back()->value; return _events.back()->value;
} else if (x <= _events.front()->when) { } else if (x <= _events.front()->when) {
return _events.front()->value; return _events.front()->value;
} }