Automated with clang-tidy readability-identifier-naming (config added to .clang-tidy) plus scripted passes, per the updated rules now documented in CONTRIBUTING.md: - types (class/struct/enum/alias/template params): PascalCase - functions, variables, members: snake_case (incl. rational -> Rational) - private/protected members: trailing underscore; static member variables likewise (instance_, available_themes_) - constants and enum values: snake_case (kLinear -> k_linear, F32P -> f32p); ALL_CAPS reserved for macros - macros: OAK_ prefix (OLIVE_ADD_TEST/OLIVE_ASSERT/OLIVE_CONFIG -> OAK_ADD_TEST/OAK_ASSERT/OAK_CONFIG, GL_PREAMBLE -> OAK_GL_PREAMBLE, include guards -> OAK_*) - file names: all lowercase (Current/Plugin/OliveHost/OliveClip/ OlivePluginInstance -> current/plugin/olivehost/oliveclip/ oliveplugininstance) - getters share the member name sans underscore, setters set_foo() - Qt and third-party (OpenFX) virtual overrides and framework callbacks keep their original names (exempt in .clang-tidy) Manual follow-ups required where automation could not reach: - string-based QMetaObject/SIGNAL/SLOT references updated to renamed methods (AddTask, CreatedFile, DeleteSpecificFile, moveSelectionUp, ...) - macro bodies referencing renamed methods (OLIVE_CONFIG, NODE_DEFAULT_DESTRUCTOR, MANAGEDDISPLAYWIDGET_*) - self-shadowing locals renamed where signals/methods became same-named (size_changed, worker_count, selected_items, import param, filters) - third_party OFX member/namespace usages restored (OFX::Host::*, _created, _clipPrefsDirty, createInstance, clearPersistentMessage) - STL protocol aliases restored (const_iterator) with .clang-tidy ignore rules; qHash overloads restored Full build and test suite pass: ctest 4/4, ~1960 gtest cases green.
76 lines
1.9 KiB
C++
76 lines
1.9 KiB
C++
/***
|
|
|
|
Olive - Non-Linear Video Editor
|
|
Copyright (C) 2022 Olive Team
|
|
Modifications Copyright (C) 2025 mikesolar
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
***/
|
|
|
|
#include "renderjobtracker.h"
|
|
|
|
namespace olive
|
|
{
|
|
|
|
void RenderJobTracker::insert(const TimeRange &range, JobTime job_time)
|
|
{
|
|
// First remove any ranges that overlap this one (code copied from TimeRangeList::remove)
|
|
TimeRangeList::util_remove(&jobs_, range);
|
|
|
|
// Now append the job
|
|
TimeRangeWithJob job(range, job_time);
|
|
jobs_.push_back(job);
|
|
}
|
|
|
|
void RenderJobTracker::insert(const TimeRangeList &ranges, JobTime job_time)
|
|
{
|
|
foreach (const TimeRange &r, ranges) {
|
|
insert(r, job_time);
|
|
}
|
|
}
|
|
|
|
void RenderJobTracker::clear()
|
|
{
|
|
jobs_.clear();
|
|
}
|
|
|
|
bool RenderJobTracker::isCurrent(const Rational &time, JobTime job_time) const
|
|
{
|
|
for (auto it = jobs_.crbegin(); it != jobs_.crend(); it++) {
|
|
if (it->contains(time)) {
|
|
return job_time >= it->get_job_time();
|
|
}
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
TimeRangeList
|
|
RenderJobTracker::getCurrentSubRanges(const TimeRange &range,
|
|
const JobTime &job_time) const
|
|
{
|
|
TimeRangeList current_ranges;
|
|
|
|
for (auto it = jobs_.crbegin(); it != jobs_.crend(); it++) {
|
|
if (job_time >= it->get_job_time() && it->overlaps_with(range)) {
|
|
current_ranges.insert(it->intersected(range));
|
|
}
|
|
}
|
|
|
|
return current_ranges;
|
|
}
|
|
|
|
}
|