ruby openshot.i: namespace fixes

- Remove `std::shared_ptr<Frame>` wrapper
- Don't place templates in std:: namespace
This commit is contained in:
FeRD (Frank Dana)
2019-08-05 02:19:52 -04:00
parent 3ce85d0fff
commit dd74fa3af8

View File

@@ -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>;