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 #627 from ferdnyc/rename-keyframe-vectors

Browse Source 
KeyFrame.h: Avoid shadowing SWIG templates
This commit is contained in:
Frank Dana
2021-01-29 01:49:23 -05:00
committed by GitHub
parent f1102a21fc 00d458210e
commit aed0052399
3 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
bindings/python/openshot.i
View File

@@ -141,6 +141,16 @@
%template() std::pair<double, double>;
%template() std::pair<float, float>;
/* Wrap std templates (list, vector, etc...) */
%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(MetadataMap) std::map<std::string, std::string>;
%template(AudioDeviceInfoVector) std::vector<openshot::AudioDeviceInfo>;
/* Make openshot.Fraction more Pythonic */
%extend openshot::Fraction {
%{
@@ -311,12 +321,3 @@
#endif
/* Wrap std templates (list, vector, etc...) */
%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(MetadataMap) std::map<std::string, std::string>;
%template(AudioDeviceInfoVector) std::vector<openshot::AudioDeviceInfo>;

4
src/KeyFrame.cpp
View File

@@ -126,10 +126,10 @@ Keyframe::Keyframe(double value) {
}
// Constructor which takes a vector of Points
Keyframe::Keyframe(const std::vector<Point>& points) : Points(points) {};
Keyframe::Keyframe(const std::vector<openshot::Point>& points) : Points(points) {};
// Constructor which takes a vector of std::pair tuples (and adds them all)
Keyframe::Keyframe(const std::vector<Coordinate>& coordinates) {
Keyframe::Keyframe(const std::vector<openshot::Coordinate>& coordinates) {
for (const auto& co : coordinates) {
AddPoint(Point(co));
}

8
src/KeyFrame.h
View File

@@ -62,8 +62,8 @@ namespace openshot {
std::vector<Point> Points; ///< Vector of all Points
public:
using CoordinateVector = std::vector<Coordinate>;
using PointsVector = std::vector<Point>;
using CoordinateVec = std::vector<Coordinate>;
using PointsVec = std::vector<Point>;
/// Default constructor for the Keyframe class
Keyframe() = default;
@@ -72,10 +72,10 @@ namespace openshot {
Keyframe(double value);
/// Constructor which adds a supplied vector of Points
Keyframe(const PointsVector& points);
Keyframe(const PointsVec& points);
/// Constructor which takes a vector of std::pair tuples
Keyframe(const CoordinateVector& coordinates);
Keyframe(const CoordinateVec& coordinates);
/// Add a new point on the key-frame. Each point has a primary coordinate, a left handle, and a right handle.
void AddPoint(Point p);