ardour/livetrax
13
0
Fork 0
Code

... commit in top level instead of gtk2_ardour. whoops.

Browse Source 
git-svn-id: svn://localhost/ardour2/trunk@2219 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2007-08-02 04:45:16 +00:00
parent 3c22c8f2d5
commit cfda46ba3e
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libs/ardour/ardour/midi_model.h
View File

@ -55,7 +55,10 @@ public:
inline uint8_t velocity() const { return _on_event.velocity(); } inline uint8_t velocity() const { return _on_event.velocity(); }
inline double duration() const { return _off_event.time() - _on_event.time(); } inline double duration() const { return _off_event.time() - _on_event.time(); }
inline void set_duration(double d) { _off_event.time() = _on_event.time() + d; } inline void set_time(double t) { _off_event.time() = t + duration(); _on_event.time() = t; }
inline void set_note(uint8_t n) { _on_event.buffer()[1] = n; _off_event.buffer()[1] = n; }
inline void set_velocity(uint8_t n) { _on_event.buffer()[2] = n; }
inline void set_duration(double d) { _off_event.time() = _on_event.time() + d; }
inline MidiEvent& on_event() { return _on_event; } inline MidiEvent& on_event() { return _on_event; }
inline MidiEvent& off_event() { return _off_event; } inline MidiEvent& off_event() { return _off_event; }

6
libs/ardour/midi_model.cc
View File

@ -116,7 +116,7 @@ MidiModel::read (MidiRingBuffer& dst, nframes_t start, nframes_t nframes, nframe
{ {
size_t read_events = 0; size_t read_events = 0;
cerr << "MM READ @ " << start << " + " << nframes << endl; //cerr << "MM READ @ " << start << " + " << nframes << endl;
/* FIXME: cache last lookup value to avoid the search */ /* FIXME: cache last lookup value to avoid the search */
@ -170,8 +170,8 @@ MidiModel::read (MidiRingBuffer& dst, nframes_t start, nframes_t nframes, nframe
} }
} }
if (read_events > 0) //if (read_events > 0)
cerr << "MM READ " << read_events << " EVENTS" << endl; // cerr << "MM READ " << read_events << " EVENTS" << endl;
return read_events; return read_events;
} }