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 pull request #595 from OpenShot/fix-get-clip-method

Browse Source 
Fixing an issue caused by timeline::GetClip returning a ClipBase* instead of Clip*
This commit is contained in:
Jonathan Thomas
2020-12-03 12:51:31 -06:00
committed by GitHub
parent 9a91abc0c2 ac73bd965d
commit e6eef0da88
4 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bindings/python/openshot.i
View File

@@ -219,6 +219,7 @@
%include "effects/Bars.h"
%include "effects/Blur.h"
%include "effects/Brightness.h"
%include "effects/Caption.h"
%include "effects/ChromaKey.h"
%include "effects/ColorShift.h"
%include "effects/Crop.h"

1
bindings/ruby/openshot.i
View File

@@ -206,6 +206,7 @@
%include "effects/Bars.h"
%include "effects/Blur.h"
%include "effects/Brightness.h"
%include "effects/Caption.h"
%include "effects/ChromaKey.h"
%include "effects/ColorShift.h"
%include "effects/Crop.h"

2
src/Timeline.cpp
View File

@@ -289,7 +289,7 @@ void Timeline::RemoveClip(Clip* clip)
}
// Look up a clip
openshot::ClipBase* Timeline::GetClip(const std::string& id)
openshot::Clip* Timeline::GetClip(const std::string& id)
{
// Find the matching clip (if any)
for (const auto& clip : clips) {

2
src/Timeline.h
View File

@@ -265,7 +265,7 @@ namespace openshot {
std::list<openshot::Clip*> Clips() { return clips; };
/// Look up a single clip by ID
openshot::ClipBase* GetClip(const std::string& id);
openshot::Clip* GetClip(const std::string& id);
/// Look up a clip effect by ID
openshot::EffectBase* GetClipEffect(const std::string& id);