From dd74fa3af83472478f52fb8b52945d3e23cbb121 Mon Sep 17 00:00:00 2001
From: "FeRD (Frank Dana)" <ferdnyc@gmail.com>
Date: Mon, 5 Aug 2019 02:19:52 -0400
Subject: [PATCH] ruby openshot.i: namespace fixes

- Remove `std::shared_ptr<Frame>` wrapper
- Don't place templates in std:: namespace
---
 src/bindings/ruby/openshot.i | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/bindings/ruby/openshot.i b/src/bindings/ruby/openshot.i
index 1f3e0d99..1b9b4969 100644
--- a/src/bindings/ruby/openshot.i
+++ b/src/bindings/ruby/openshot.i
@@ -6,8 +6,8 @@
 #
 # Copyright (c) 2008-2019 OpenShot Studios, LLC
 # <http://www.openshotstudios.com/>. This file is part of
-# OpenShot Library (libopenshot), an open-source project dedicated to 
-# delivering high quality video editing and animation solutions to the 
+# OpenShot Library (libopenshot), an open-source project dedicated to
+# delivering high quality video editing and animation solutions to the
 # world. For more information visit <http://www.openshot.org/>.
 #
 # OpenShot Library (libopenshot) is free software: you can redistribute it
@@ -56,8 +56,6 @@ namespace std {
 #endif
 %template(SPtrAudioBuffer) std::shared_ptr<juce::AudioSampleBuffer>;
 %template(SPtrOpenFrame) std::shared_ptr<openshot::Frame>;
-%template(SPtrFrame) std::shared_ptr<Frame>;
-
 
 %{
 /* Ruby and FFmpeg define competing RSHIFT macros,
@@ -216,13 +214,11 @@ namespace std {
 
 
 /* Wrap std templates (list, vector, etc...) */
-namespace std {
- %template(ClipList) list<Clip *>;
- %template(EffectBaseList) list<EffectBase *>;
- %template(CoordinateVector) vector<Coordinate>;
- %template(PointsVector) vector<Point>;
- %template(FieldVector) vector<Field>;
- %template(MappedFrameVector) vector<MappedFrame>;
- %template(MappedMetadata) map<string, string>;
- %template(AudioDeviceInfoVector) vector<AudioDeviceInfo>;
-}
+%template(ClipList) std::list<openshot::Clip *>;
+%template(EffectBaseList) std::list<openshot::EffectBase *>;
+%template(CoordinateVector) std::vector<openshot::Coordinate>;
+%template(PointsVector) std::vector<openshot::Point>;
+%template(FieldVector) std::vector<openshot::Field>;
+%template(MappedFrameVector) std::vector<openshot::MappedFrame>;
+%template(MappedMetadata) std::map<std::string, std::string>;
+%template(AudioDeviceInfoVector) std::vector<openshot::AudioDeviceInfo>;