You've already forked libopenshot
mirror of
https://github.com/OpenShot/libopenshot.git
synced 2026-03-02 08:53:52 -08:00
Fixed variable names and comments
thanks to Frank Dana
This commit is contained in:
@@ -65,16 +65,13 @@ if (BLACKMAGIC_FOUND)
|
||||
endif()
|
||||
|
||||
############### OPENCV EXAMPLE ################
|
||||
find_package( OpenCV 4 )
|
||||
if (OpenCV_FOUND)
|
||||
if (DEFINED CACHE{HAVE_OPENCV})
|
||||
# Create test executable
|
||||
add_executable(openshot-example-opencv
|
||||
Example_opencv.cpp)
|
||||
|
||||
target_compile_definitions(openshot-example-opencv PRIVATE
|
||||
-DTEST_MEDIA_PATH="${TEST_MEDIA_PATH}" )
|
||||
|
||||
-DTEST_MEDIA_PATH="${TEST_MEDIA_PATH}" )
|
||||
# Link test executable to the new library
|
||||
target_link_libraries(openshot-example-opencv openshot)
|
||||
|
||||
endif()
|
||||
|
||||
@@ -438,19 +438,19 @@ openshot::EffectBase* Timeline::GetClipEffect(const std::string& id)
|
||||
std::list<openshot::EffectBase*> Timeline::ClipEffects() const {
|
||||
|
||||
// Initialize the list
|
||||
std::list<EffectBase*> ClipEffects;
|
||||
std::list<EffectBase*> timelineEffectsList;
|
||||
|
||||
// Loop through all clips
|
||||
for (const auto& clip : clips) {
|
||||
|
||||
// Get the clip's list of effects
|
||||
std::list<EffectBase*> clipEffects = clip->Effects();
|
||||
std::list<EffectBase*> clipEffectsList = clip->Effects();
|
||||
|
||||
// Append the clip's effects to the list
|
||||
ClipEffects.insert(ClipEffects.end(), clipEffects.begin(), clipEffects.end());
|
||||
timelineEffectsList.insert(timelineEffectsList.end(), clipEffectsList.begin(), clipEffectsList.end());
|
||||
}
|
||||
|
||||
return ClipEffects;
|
||||
return timelineEffectsList;
|
||||
}
|
||||
|
||||
// Compute the end time of the latest timeline element
|
||||
|
||||
@@ -66,10 +66,10 @@ namespace openshot {
|
||||
Keyframe visible;
|
||||
Keyframe draw_box;
|
||||
|
||||
/// Blank constructor
|
||||
/// Default constructor
|
||||
TrackedObjectBase();
|
||||
|
||||
/// Default constructor
|
||||
/// Constructor which takes an object ID
|
||||
TrackedObjectBase(std::string _id);
|
||||
|
||||
/// Get the id of this object
|
||||
|
||||
@@ -29,6 +29,7 @@
|
||||
*/
|
||||
|
||||
#include <catch2/catch.hpp>
|
||||
#include <sstream>
|
||||
|
||||
#include "Point.h"
|
||||
#include "Enums.h"
|
||||
|
||||
Reference in New Issue
Block a user