diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-03-18 03:42:32 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-03-18 03:42:32 +0000 |
| commit | eb4a1fdbb8fec1f8aa5dfe33f882064e85792a84 (patch) | |
| tree | b97aadaf2a8593e33ceaf1e4da78ab39d2608702 /libs/ardour/smf_source.cc | |
| parent | d69f4e9e3dde0e400c80bca37f7bfcc555fbbf1b (diff) | |
refactor JACK MIDI port to allow writing from a non-process() thread, and move ARDOUR::MidiEvent into MIDI namespace along with midi_events.h header
git-svn-id: svn://localhost/ardour2/branches/3.0@3155 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/smf_source.cc')
| -rw-r--r-- | libs/ardour/smf_source.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/smf_source.cc b/libs/ardour/smf_source.cc index bd4f837780..720626e936 100644 --- a/libs/ardour/smf_source.cc +++ b/libs/ardour/smf_source.cc @@ -432,7 +432,7 @@ SMFSource::write_unlocked (MidiRingBuffer& src, nframes_t cnt) assert(time >= _timeline_position); time -= _timeline_position; - const MidiEvent ev(time, size, buf); + const MIDI::Event ev(time, size, buf); append_event_unlocked(Frames, ev); if (_model) @@ -452,7 +452,7 @@ SMFSource::write_unlocked (MidiRingBuffer& src, nframes_t cnt) void -SMFSource::append_event_unlocked(EventTimeUnit unit, const MidiEvent& ev) +SMFSource::append_event_unlocked(EventTimeUnit unit, const MIDI::Event& ev) { /*printf("%s - append chan = %u, time = %lf, size = %u, data = ", _path.c_str(), (unsigned)ev.channel(), ev.time(), ev.size()); @@ -886,7 +886,7 @@ SMFSource::load_model(bool lock, bool force_reload) fseek(_fd, _header_size, 0); uint64_t time = 0; /* in SMF ticks */ - MidiEvent ev; + MIDI::Event ev; size_t scratch_size = 0; // keep track of scratch and minimize reallocs |