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 #296 from OpenShot/std-prefixes

Browse Source 
Remove all 'using namespace' directives from headers
This commit is contained in:
Jonathan Thomas
2019-11-17 16:18:14 -06:00
committed by GitHub
parent 458c0be919 75e9ba38e6
commit 272f004c0e
110 changed files with 1034 additions and 1132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/bindings/python/openshot.i
View File

@@ -56,7 +56,6 @@
#endif
%shared_ptr(juce::AudioSampleBuffer)
%shared_ptr(openshot::Frame)
%shared_ptr(Frame)
%{
#include "OpenShotVersion.h"
@@ -226,13 +225,11 @@
/* 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>;

20
src/bindings/ruby/openshot.i
View File

@@ -59,8 +59,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,
@@ -223,13 +221,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>;