summaryrefslogtreecommitdiff
path: root/libs/ardour/smf_source.cc
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2007-06-06 15:39:56 +0000
committerDavid Robillard <d@drobilla.net>2007-06-06 15:39:56 +0000
commitca40990444b09d1de532c572793ab702840714f7 (patch)
tree2d25d3c61bcdfe9ae6455df90e27884d9e2f0659 /libs/ardour/smf_source.cc
parent3718a85c293dff77248ab1613e9cedc3c9c6e1c7 (diff)
Fix MIDI session path problems (thanks timbyr).
Fix conversion warnings in smf_source.cc. git-svn-id: svn://localhost/ardour2/trunk@1957 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/smf_source.cc')
-rw-r--r--libs/ardour/smf_source.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/smf_source.cc b/libs/ardour/smf_source.cc
index 0bc02f3998..730ba053bd 100644
--- a/libs/ardour/smf_source.cc
+++ b/libs/ardour/smf_source.cc
@@ -370,7 +370,7 @@ SMFSource::write_unlocked (MidiRingBuffer& src, nframes_t cnt)
assert(ev.time >= _timeline_position);
ev.time -= _timeline_position;
assert(ev.time >= _last_ev_time);
- const uint32_t delta_time = (uint32_t)(ev.time - _last_ev_time) / frames_per_beat * _ppqn;
+ const uint32_t delta_time = (uint32_t)((ev.time - _last_ev_time) / frames_per_beat * _ppqn);
/*printf("SMF - writing event, delta = %u, size = %zu, data = ",
delta_time, ev.size);
@@ -781,7 +781,7 @@ SMFSource::load_model(bool lock)
fseek(_fd, _header_size, 0);
- double time = 0;
+ nframes_t time = 0;
MidiEvent ev;
int ret;