summaryrefslogtreecommitdiff
path: root/libs/evoral/src/SMF.cpp
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2010-06-20 22:49:35 +0000
committerCarl Hetherington <carl@carlh.net>2010-06-20 22:49:35 +0000
commit40ffadf219af47762dc7bee64ad8352b2087e15d (patch)
tree5b9f598fc75106b84463419f74b689c461111f4d /libs/evoral/src/SMF.cpp
parentc4e6b368ae493a15d466d1ec2a5e13b35481153c (diff)
Return delta time even for metadata events. Should fix #3244.
git-svn-id: svn://localhost/ardour2/branches/3.0@7282 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/evoral/src/SMF.cpp')
-rw-r--r--libs/evoral/src/SMF.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/evoral/src/SMF.cpp b/libs/evoral/src/SMF.cpp
index 007055def8..b8705afbf0 100644
--- a/libs/evoral/src/SMF.cpp
+++ b/libs/evoral/src/SMF.cpp
@@ -202,10 +202,12 @@ SMF::read_event(uint32_t* delta_t, uint32_t* size, uint8_t** buf) const
assert(buf);
if ((event = smf_track_get_next_event(_smf_track)) != NULL) {
+
+ *delta_t = event->delta_time_pulses;
+
if (smf_event_is_metadata(event)) {
return 0;
}
- *delta_t = event->delta_time_pulses;
int event_size = event->midi_buffer_length;
assert(event_size > 0);