Note the time of the last event that was read by read_unlocked, so that the current...

git-svn-id: svn://localhost/ardour2/branches/3.0@7148 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/libs/ardour/ardour/smf_source.h b/libs/ardour/ardour/smf_source.h
index 44080a8cff898cd6b0b3219393edba66d78d6b25..d271cb0dbad5bb7144197109a1a048e270a63d28 100644 (file)
--- a/libs/ardour/ardour/smf_source.h
+++ b/libs/ardour/ardour/smf_source.h
@@ -86,7 +86,10 @@ private:
 
        double    _last_ev_time_beats;
        sframes_t _last_ev_time_frames;
+       /** end time (start + duration) of last call to read_unlocked */
        mutable sframes_t _smf_last_read_end;
+       /** time (in SMF ticks, 1 tick per _ppqn) of the last event read by read_unlocked */
+       mutable sframes_t _smf_last_read_time;
 };
 
 }; /* namespace ARDOUR */

diff --git a/libs/ardour/smf_source.cc b/libs/ardour/smf_source.cc
index e4727761b537ff0d41130c57be49ed948f6ecf72..f326b19799294acdf3d39c562a21a798a909a78a 100644 (file)
--- a/libs/ardour/smf_source.cc
+++ b/libs/ardour/smf_source.cc
@@ -56,6 +56,7 @@ SMFSource::SMFSource (Session& s, const ustring& path, Source::Flag flags)
        , _last_ev_time_beats(0.0)
        , _last_ev_time_frames(0)
        , _smf_last_read_end (0)
+       , _smf_last_read_time (0)
 {
        if (init(_path, false)) {
                throw failed_constructor ();
@@ -76,6 +77,7 @@ SMFSource::SMFSource (Session& s, const XMLNode& node, bool must_exist)
        , _last_ev_time_beats(0.0)
        , _last_ev_time_frames(0)
        , _smf_last_read_end (0)
+       , _smf_last_read_time (0)
 {
        if (set_state(node, Stateful::loading_state_version)) {
                throw failed_constructor ();
@@ -134,6 +136,8 @@ SMFSource::read_unlocked (Evoral::EventSink<nframes_t>& destination, sframes_t s
                        }
                        time += ev_delta_t; // accumulate delta time
                }
+       } else {
+               time = _smf_last_read_time;
        }
 
        _smf_last_read_end = start + duration;
@@ -145,6 +149,7 @@ SMFSource::read_unlocked (Evoral::EventSink<nframes_t>& destination, sframes_t s
                }
 
                time += ev_delta_t; // accumulate delta time
+               _smf_last_read_time = time;
 
                if (ret == 0) { // meta-event (skipped, just accumulate time)
                        continue;