openshot/libopenshot
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot.git synced 2026-03-02 08:53:52 -08:00
Code Issues Packages Projects Releases Wiki Activity

Fixing whitespace

Browse Source
This commit is contained in:
Jonathan Thomas
2022-10-28 19:01:27 -05:00
parent 1547fb1d52
commit 9f3fa0af52
2 changed files with 64 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Timeline.cpp
View File

@@ -343,9 +343,9 @@ void Timeline::AddClip(Clip* clip)
// All clips should be converted to the frame rate of this timeline
if (auto_map_clips) {
// Apply framemapper (or update existing framemapper)
apply_mapper_to_clip(clip);
}
// Apply framemapper (or update existing framemapper)
apply_mapper_to_clip(clip);
}
// Add clip to list
clips.push_back(clip);
@@ -856,8 +856,8 @@ void Timeline::Close()
{
ZmqLogger::Instance()->AppendDebugMethod("Timeline::Close");
// Get lock (prevent getting frames while this happens)
const std::lock_guard<std::recursive_mutex> guard(getFrameMutex);
// Get lock (prevent getting frames while this happens)
const std::lock_guard<std::recursive_mutex> guard(getFrameMutex);
// Close all open clips
for (auto clip : clips)
@@ -1151,8 +1151,8 @@ Json::Value Timeline::JsonValue() const {
// Load JSON string into this object
void Timeline::SetJson(const std::string value) {
// Get lock (prevent getting frames while this happens)
const std::lock_guard<std::recursive_mutex> lock(getFrameMutex);
// Get lock (prevent getting frames while this happens)
const std::lock_guard<std::recursive_mutex> lock(getFrameMutex);
// Parse JSON string into JSON objects
try
@@ -1394,8 +1394,8 @@ void Timeline::apply_json_to_clips(Json::Value change) {
// Apply framemapper (or update existing framemapper)
if (auto_map_clips) {
apply_mapper_to_clip(existing_clip);
}
apply_mapper_to_clip(existing_clip);
}
}
} else if (change_type == "delete") {
@@ -1526,7 +1526,7 @@ void Timeline::apply_json_to_effects(Json::Value change, EffectBase* existing_ef
// Apply JSON diff to timeline properties
void Timeline::apply_json_to_timeline(Json::Value change) {
bool cache_dirty = true;
bool cache_dirty = true;
// Get key and type of change
std::string change_type = change["type"].asString();
@@ -1558,7 +1558,7 @@ void Timeline::apply_json_to_timeline(Json::Value change) {
info.video_length = info.fps.ToFloat() * info.duration;
// We don't want to clear cache for duration adjustments
cache_dirty = false;
cache_dirty = false;
}
else if (root_key == "width") {
// Set width
@@ -1647,8 +1647,8 @@ void Timeline::apply_json_to_timeline(Json::Value change) {
}
if (cache_dirty) {
// Clear entire cache
ClearAllCache();
// Clear entire cache
ClearAllCache();
}
}