oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove functions that were moved to the timerange class

Browse Source
This commit is contained in:
itsmattkc
2019-11-17 12:31:02 +09:00
parent 60a27961c2
commit 863525c595
2 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/render/backend/audiorenderbackend.cpp
+2 -13
View File
@@ -84,9 +84,9 @@ void AudioRenderBackend::ValidateRanges()
for (int j=0;j<cache_queue_.size();j++) {
const TimeRange& range2 = cache_queue_.at(j);
if (RangesOverlap(range1, range2) && i != j) {
if (TimeRange::Overlap(range1, range2) && i != j) {
// Combine with the first range
cache_queue_[i] = CombineRange(range1, range2);
cache_queue_[i] = TimeRange::Combine(range1, range2);
// Remove the second range
cache_queue_.removeAt(j);
@@ -103,14 +103,3 @@ QString AudioRenderBackend::CachePathName()
return this_cache_dir.filePath(QStringLiteral("pcm"));
}
TimeRange AudioRenderBackend::CombineRange(const TimeRange &a, const TimeRange &b)
{
return TimeRange(qMin(a.in(), b.in()),
qMax(a.out(), b.out()));
}
bool AudioRenderBackend::RangesOverlap(const TimeRange &a, const TimeRange &b)
{
return !(a.out() < b.in() || a.in() > b.out());
}
app/render/backend/audiorenderbackend.h
-4
View File
@@ -42,10 +42,6 @@ protected:
private:
void ValidateRanges();
TimeRange CombineRange(const TimeRange& a, const TimeRange& b);
bool RangesOverlap(const TimeRange& a, const TimeRange& b);
AudioRenderingParams params_;
};