6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-07-17 13:29:02 +00:00
Code Issues Projects Releases Wiki Activity

Still by manual inspection: the time for the next event should be provisional until proven acceptable, allowing a proper measurement of time until exiting the period to be taken; also fixed the accumulated period error when seeking back onto the underlying track.

Browse Source
This commit is contained in:
Thomas Harte 2016-12-20 08:14:16 -05:00
parent 6bdde542c5
commit 497b2ae4dd
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Storage/Disk/PCMPatchedTrack.cpp
View File

@ -102,16 +102,17 @@ Track::Event PCMPatchedTrack::get_next_event()
else event = underlying_track_->get_next_event(); else event = underlying_track_->get_next_event();
// see what time that gets us to. If it's still within the current period, return the found event // see what time that gets us to. If it's still within the current period, return the found event
current_time_ += event.length; Time event_time = current_time_ + event.length;
if(current_time_ < active_period_->end_time) if(event_time < active_period_->end_time)
{ {
current_time_ = event_time;
event.length += extra_time - period_error; event.length += extra_time - period_error;
return event; return event;
} }
// otherwise move time back to the end of the outgoing period, accumulating the error into // otherwise move time back to the end of the outgoing period, accumulating the error into
// extra_time, and advance the extra period // extra_time, and advance the extra period
extra_time += (current_time_ - active_period_->end_time); extra_time += (active_period_->end_time - current_time_);
current_time_ = active_period_->end_time; current_time_ = active_period_->end_time;
active_period_++; active_period_++;
@ -135,7 +136,7 @@ Track::Event PCMPatchedTrack::get_next_event()
// if this is not the end of the track then move to the next period and note how much will need // if this is not the end of the track then move to the next period and note how much will need
// to be subtracted if an event is found here // to be subtracted if an event is found here
if(active_period_->event_source) period_error = active_period_->segment_start_time - active_period_->event_source->seek_to(active_period_->segment_start_time); if(active_period_->event_source) period_error = active_period_->segment_start_time - active_period_->event_source->seek_to(active_period_->segment_start_time);
else period_error = underlying_track_->seek_to(current_time_) - current_time_; else period_error = current_time_ - underlying_track_->seek_to(current_time_);
} }
} }
} }