diff options
| author | David Robillard <d@drobilla.net> | 2008-10-13 02:43:14 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-10-13 02:43:14 +0000 |
| commit | 1514039689555915c4cb1f17cc09dec43f6ea1e5 (patch) | |
| tree | ca8c0bd5c3893a3fb2a4164d10c0d5e6b484edd0 /libs/ardour/smf_source.cc | |
| parent | 8b951bb9ee65f3d530848c3c08b8b54e6571317f (diff) | |
Fix pollution of global namespace by Evoral.
git-svn-id: svn://localhost/ardour2/branches/3.0@3947 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/smf_source.cc')
| -rw-r--r-- | libs/ardour/smf_source.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/smf_source.cc b/libs/ardour/smf_source.cc index c60ee7de41..9caf005833 100644 --- a/libs/ardour/smf_source.cc +++ b/libs/ardour/smf_source.cc @@ -197,9 +197,9 @@ SMFSource::write_unlocked (MidiRingBuffer& src, nframes_t cnt) { _write_data_count = 0; - EventTime time; - EventType type; - uint32_t size; + Evoral::EventTime time; + Evoral::EventType type; + uint32_t size; size_t buf_capacity = 4; uint8_t* buf = (uint8_t*)malloc(buf_capacity); @@ -643,7 +643,7 @@ SMFSource::load_model(bool lock, bool force_reload) if (ret > 0) { // didn't skip (meta) event // make ev.time absolute time in frames - ev.time() = time * frames_per_beat / (EventTime)ppqn(); + ev.time() = time * frames_per_beat / (Evoral::EventTime)ppqn(); ev.set_event_type(EventTypeMap::instance().midi_event_type(buf[0])); _model->append(ev); } |