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

Merge branch 'develop' into sharpen-effect

Browse Source 
# Conflicts:
#	src/EffectInfo.cpp
#	tests/CMakeLists.txt
This commit is contained in:
Jonathan Thomas
2025-05-23 22:26:35 -05:00
parent 91588fa554 ea74c500a0
commit 86ebbb8ff9
17 changed files with 870 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/EffectInfo.cpp
View File

@@ -13,6 +13,7 @@
#include "EffectInfo.h"
#include "Effects.h"
#include "effects/Sharpen.h"
#include "effects/SphericalProjection.h"
using namespace openshot;
@@ -71,6 +72,9 @@ EffectBase* EffectInfo::CreateEffect(std::string effect_type) {
else if (effect_type == "Shift")
return new Shift();
else if (effect_type == "SphericalProjection")
return new SphericalProjection();
else if (effect_type == "Wave")
return new Wave();
@@ -140,6 +144,7 @@ Json::Value EffectInfo::JsonValue() {
root.append(Saturation().JsonInfo());
root.append(Sharpen().JsonInfo());
root.append(Shift().JsonInfo());
root.append(SphericalProjection().JsonInfo());
root.append(Wave().JsonInfo());
/* Audio */
root.append(Noise().JsonInfo());