From ac73bd965d21acc4d7e6f2a83c16f83ba002d7bb Mon Sep 17 00:00:00 2001
From: Jonathan Thomas <jonathan@openshot.org>
Date: Thu, 3 Dec 2020 10:52:27 -0600
Subject: [PATCH] Fixing an issue caused by timeline::GetClip returning a
 ClipBase instead of a Clip (broke waveform generation). Also adding a swig
 definition for the Caption effect.

---
 bindings/python/openshot.i | 1 +
 bindings/ruby/openshot.i   | 1 +
 src/Timeline.cpp           | 2 +-
 src/Timeline.h             | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/bindings/python/openshot.i b/bindings/python/openshot.i
index b2c62c74..7197f7dd 100644
--- a/bindings/python/openshot.i
+++ b/bindings/python/openshot.i
@@ -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"
diff --git a/bindings/ruby/openshot.i b/bindings/ruby/openshot.i
index e7a6fa7b..fe47f1bc 100644
--- a/bindings/ruby/openshot.i
+++ b/bindings/ruby/openshot.i
@@ -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"
diff --git a/src/Timeline.cpp b/src/Timeline.cpp
index abc02b6f..d7377a28 100644
--- a/src/Timeline.cpp
+++ b/src/Timeline.cpp
@@ -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) {
diff --git a/src/Timeline.h b/src/Timeline.h
index 1d156153..e12cf3ee 100644
--- a/src/Timeline.h
+++ b/src/Timeline.h
@@ -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);