made timerangelist a encapsulation rather than a derivation
Locks off functionality that really shouldn't be used.
This commit is contained in:
@@ -127,7 +127,7 @@ void AudioPlaybackCache::WritePCM(const TimeRange &range, SampleBufferPtr sample
|
||||
|
||||
seg_file.close();
|
||||
|
||||
ranges_we_validated.InsertTimeRange(TimeRange(this_write_in_point, this_write_out_point));
|
||||
ranges_we_validated.insert(TimeRange(this_write_in_point, this_write_out_point));
|
||||
} else {
|
||||
qWarning() << "Failed to write PCM data to" << seg_file.fileName();
|
||||
}
|
||||
|
||||
@@ -90,7 +90,7 @@ void FrameHashCache::ValidateFramesWithHash(const QByteArray &hash)
|
||||
if (iterator.value() == hash) {
|
||||
TimeRange frame_range(iterator.key(), iterator.key() + timebase_);
|
||||
|
||||
if (invalidated_ranges.ContainsTimeRange(frame_range)) {
|
||||
if (invalidated_ranges.contains(frame_range)) {
|
||||
Validate(frame_range);
|
||||
}
|
||||
}
|
||||
@@ -167,7 +167,7 @@ QVector<rational> FrameHashCache::GetFrameListFromTimeRange(TimeRangeList range_
|
||||
}
|
||||
|
||||
times.append(snapped);
|
||||
range_list.RemoveTimeRange(TimeRange(snapped, next));
|
||||
range_list.remove(TimeRange(snapped, next));
|
||||
}
|
||||
|
||||
return times;
|
||||
@@ -362,7 +362,7 @@ void FrameHashCache::HashDeleted(const QString& s, const QByteArray &hash)
|
||||
QMap<rational, QByteArray>::const_iterator i;
|
||||
for (i=time_hash_map_.constBegin(); i!=time_hash_map_.constEnd(); i++) {
|
||||
if (i.value() == hash) {
|
||||
ranges_to_invalidate.InsertTimeRange(TimeRange(i.key(), i.key() + timebase_));
|
||||
ranges_to_invalidate.insert(TimeRange(i.key(), i.key() + timebase_));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -33,7 +33,7 @@ void PlaybackCache::Invalidate(const TimeRange &r)
|
||||
{
|
||||
Q_ASSERT(r.in() != r.out());
|
||||
|
||||
invalidated_.InsertTimeRange(r);
|
||||
invalidated_.insert(r);
|
||||
|
||||
RemoveRangeFromJobs(r);
|
||||
qint64 job_time = QDateTime::currentMSecsSinceEpoch();
|
||||
@@ -69,11 +69,11 @@ void PlaybackCache::SetLength(const rational &r)
|
||||
jobs_.clear();
|
||||
} else if (r > length_) {
|
||||
// If new length is greater, simply extend the invalidated range for now
|
||||
invalidated_.InsertTimeRange(range_diff);
|
||||
invalidated_.insert(range_diff);
|
||||
jobs_.append({range_diff, QDateTime::currentMSecsSinceEpoch()});
|
||||
} else {
|
||||
// If new length is smaller, removed hashes
|
||||
invalidated_.RemoveTimeRange(range_diff);
|
||||
invalidated_.remove(range_diff);
|
||||
RemoveRangeFromJobs(range_diff);
|
||||
}
|
||||
|
||||
@@ -123,7 +123,7 @@ void PlaybackCache::Shift(const rational &from, const rational &to)
|
||||
|
||||
void PlaybackCache::Validate(const TimeRange &r)
|
||||
{
|
||||
invalidated_.RemoveTimeRange(r);
|
||||
invalidated_.remove(r);
|
||||
|
||||
emit Validated(r);
|
||||
}
|
||||
|
||||
@@ -136,7 +136,7 @@ void PreviewAutoCacher::VideoInvalidated(const TimeRange &range)
|
||||
if (ignore_next_mouse_button_ || !(qApp->mouseButtons() & Qt::LeftButton)) {
|
||||
ignore_next_mouse_button_ = false;
|
||||
|
||||
invalidated_video_.InsertTimeRange(range);
|
||||
invalidated_video_.insert(range);
|
||||
|
||||
TryRender();
|
||||
}
|
||||
@@ -147,7 +147,7 @@ void PreviewAutoCacher::AudioInvalidated(const TimeRange &range)
|
||||
ClearQueue(false);
|
||||
|
||||
// Start jobs to re-render the audio at this range, split into 2 second chunks
|
||||
invalidated_audio_.InsertTimeRange(range);
|
||||
invalidated_audio_.insert(range);
|
||||
|
||||
TryRender();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user