smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-15 11:06:32 +01:00
Code Issues Projects Releases Wiki Activity

Fix pollution of global namespace by Evoral.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@3947 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2008-10-13 02:43:14 +00:00
parent 8b951bb9ee
commit 1514039689
12 changed files with 64 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libs/ardour/smf_source.cc
View file

@ -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);
}