Skip to content

Commit

Permalink
Merge c98b041 into 3b73425
Browse files Browse the repository at this point in the history
  • Loading branch information
ferdnyc committed Jan 27, 2021
2 parents 3b73425 + c98b041 commit 57678ac
Show file tree
Hide file tree
Showing 15 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion src/effects/Bars.h
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ namespace openshot
///
/// @returns A new openshot::Frame object
/// @param frame_number The frame number (starting at 1) of the clip or effect on the timeline.
std::shared_ptr<openshot::Frame> GetFrame(int64_t frame_number) override { return GetFrame(std::shared_ptr<Frame> (new Frame()), frame_number); }
std::shared_ptr<openshot::Frame> GetFrame(int64_t frame_number) override { return GetFrame(std::make_shared<openshot::Frame>(), frame_number); }

/// @brief This method is required for all derived classes of ClipBase, and returns a
/// modified openshot::Frame object
Expand Down
2 changes: 1 addition & 1 deletion src/effects/Blur.h
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ namespace openshot
///
/// @returns A new openshot::Frame object
/// @param frame_number The frame number (starting at 1) of the clip or effect on the timeline.
std::shared_ptr<openshot::Frame> GetFrame(int64_t frame_number) override { return GetFrame(std::shared_ptr<Frame> (new Frame()), frame_number); }
std::shared_ptr<openshot::Frame> GetFrame(int64_t frame_number) override { return GetFrame(std::make_shared<openshot::Frame>(), frame_number); }

/// @brief This method is required for all derived classes of ClipBase, and returns a
/// modified openshot::Frame object
Expand Down
2 changes: 1 addition & 1 deletion src/effects/Brightness.h
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ namespace openshot
///
/// @returns A new openshot::Frame object
/// @param frame_number The frame number (starting at 1) of the clip or effect on the timeline.
std::shared_ptr<openshot::Frame> GetFrame(int64_t frame_number) override { return GetFrame(std::shared_ptr<Frame> (new Frame()), frame_number); }
std::shared_ptr<openshot::Frame> GetFrame(int64_t frame_number) override { return GetFrame(std::make_shared<openshot::Frame>(), frame_number); }

/// @brief This method is required for all derived classes of ClipBase, and returns a
/// modified openshot::Frame object
Expand Down
2 changes: 1 addition & 1 deletion src/effects/Caption.h
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ class Caption : public EffectBase
///
/// @returns A new openshot::Frame object
/// @param frame_number The frame number (starting at 1) of the clip or effect on the timeline.
std::shared_ptr<openshot::Frame> GetFrame(int64_t frame_number) override { return GetFrame(std::shared_ptr<Frame> (new Frame()), frame_number); }
std::shared_ptr<openshot::Frame> GetFrame(int64_t frame_number) override { return GetFrame(std::make_shared<openshot::Frame>(), frame_number); }

/// @brief This method is required for all derived classes of ClipBase, and returns a
/// modified openshot::Frame object
Expand Down
2 changes: 1 addition & 1 deletion src/effects/ChromaKey.h
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ namespace openshot
///
/// @returns A new openshot::Frame object
/// @param frame_number The frame number (starting at 1) of the clip or effect on the timeline.
std::shared_ptr<openshot::Frame> GetFrame(int64_t frame_number) override { return GetFrame(std::shared_ptr<Frame> (new Frame()), frame_number); }
std::shared_ptr<openshot::Frame> GetFrame(int64_t frame_number) override { return GetFrame(std::make_shared<openshot::Frame>(), frame_number); }

/// @brief This method is required for all derived classes of ClipBase, and returns a
/// modified openshot::Frame object
Expand Down
2 changes: 1 addition & 1 deletion src/effects/ColorShift.h
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ namespace openshot
///
/// @returns A new openshot::Frame object
/// @param frame_number The frame number (starting at 1) of the clip or effect on the timeline.
std::shared_ptr<openshot::Frame> GetFrame(int64_t frame_number) override { return GetFrame(std::shared_ptr<Frame> (new Frame()), frame_number); }
std::shared_ptr<openshot::Frame> GetFrame(int64_t frame_number) override { return GetFrame(std::make_shared<openshot::Frame>(), frame_number); }

/// @brief This method is required for all derived classes of ClipBase, and returns a
/// modified openshot::Frame object
Expand Down
2 changes: 1 addition & 1 deletion src/effects/Crop.h
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ namespace openshot
///
/// @returns A new openshot::Frame object
/// @param frame_number The frame number (starting at 1) of the clip or effect on the timeline.
std::shared_ptr<openshot::Frame> GetFrame(int64_t frame_number) override { return GetFrame(std::shared_ptr<Frame> (new Frame()), frame_number); }
std::shared_ptr<openshot::Frame> GetFrame(int64_t frame_number) override { return GetFrame(std::make_shared<openshot::Frame>(), frame_number); }

/// @brief This method is required for all derived classes of ClipBase, and returns a
/// modified openshot::Frame object
Expand Down
2 changes: 1 addition & 1 deletion src/effects/Deinterlace.h
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ namespace openshot
///
/// @returns A new openshot::Frame object
/// @param frame_number The frame number (starting at 1) of the clip or effect on the timeline.
std::shared_ptr<openshot::Frame> GetFrame(int64_t frame_number) override { return GetFrame(std::shared_ptr<Frame> (new Frame()), frame_number); }
std::shared_ptr<openshot::Frame> GetFrame(int64_t frame_number) override { return GetFrame(std::make_shared<openshot::Frame>(), frame_number); }

/// @brief This method is required for all derived classes of ClipBase, and returns a
/// modified openshot::Frame object
Expand Down
2 changes: 1 addition & 1 deletion src/effects/Hue.h
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ namespace openshot
///
/// @returns A new openshot::Frame object
/// @param frame_number The frame number (starting at 1) of the clip or effect on the timeline.
std::shared_ptr<openshot::Frame> GetFrame(int64_t frame_number) override { return GetFrame(std::shared_ptr<Frame> (new Frame()), frame_number); }
std::shared_ptr<openshot::Frame> GetFrame(int64_t frame_number) override { return GetFrame(std::make_shared<openshot::Frame>(), frame_number); }

/// @brief This method is required for all derived classes of ClipBase, and returns a
/// modified openshot::Frame object
Expand Down
2 changes: 1 addition & 1 deletion src/effects/Mask.h
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ namespace openshot
///
/// @returns A new openshot::Frame object
/// @param frame_number The frame number (starting at 1) of the clip or effect on the timeline.
std::shared_ptr<openshot::Frame> GetFrame(int64_t frame_number) override { return GetFrame(std::shared_ptr<Frame> (new Frame()), frame_number); }
std::shared_ptr<openshot::Frame> GetFrame(int64_t frame_number) override { return GetFrame(std::make_shared<openshot::Frame>(), frame_number); }

/// @brief This method is required for all derived classes of ClipBase, and returns a
/// modified openshot::Frame object
Expand Down
2 changes: 1 addition & 1 deletion src/effects/Negate.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ namespace openshot
///
/// @returns A new openshot::Frame object
/// @param frame_number The frame number (starting at 1) of the clip or effect on the timeline.
std::shared_ptr<openshot::Frame> GetFrame(int64_t frame_number) override { return GetFrame(std::shared_ptr<Frame> (new Frame()), frame_number); }
std::shared_ptr<openshot::Frame> GetFrame(int64_t frame_number) override { return GetFrame(std::make_shared<openshot::Frame>(), frame_number); }

/// @brief This method is required for all derived classes of ClipBase, and returns a
/// modified openshot::Frame object
Expand Down
2 changes: 1 addition & 1 deletion src/effects/Pixelate.h
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ namespace openshot
///
/// @returns A new openshot::Frame object
/// @param frame_number The frame number (starting at 1) of the clip or effect on the timeline.
std::shared_ptr<openshot::Frame> GetFrame(int64_t frame_number) override { return GetFrame(std::shared_ptr<Frame> (new Frame()), frame_number); }
std::shared_ptr<openshot::Frame> GetFrame(int64_t frame_number) override { return GetFrame(std::make_shared<openshot::Frame>(), frame_number); }

/// @brief This method is required for all derived classes of ClipBase, and returns a
/// modified openshot::Frame object
Expand Down
2 changes: 1 addition & 1 deletion src/effects/Saturation.h
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ namespace openshot
///
/// @returns A new openshot::Frame object
/// @param frame_number The frame number (starting at 1) of the clip or effect on the timeline.
std::shared_ptr<openshot::Frame> GetFrame(int64_t frame_number) override { return GetFrame(std::shared_ptr<Frame> (new Frame()), frame_number); }
std::shared_ptr<openshot::Frame> GetFrame(int64_t frame_number) override { return GetFrame(std::make_shared<openshot::Frame>(), frame_number); }

/// @brief This method is required for all derived classes of ClipBase, and returns a
/// modified openshot::Frame object
Expand Down
2 changes: 1 addition & 1 deletion src/effects/Shift.h
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ namespace openshot
///
/// @returns A new openshot::Frame object
/// @param frame_number The frame number (starting at 1) of the clip or effect on the timeline.
std::shared_ptr<openshot::Frame> GetFrame(int64_t frame_number) override { return GetFrame(std::shared_ptr<Frame> (new Frame()), frame_number); }
std::shared_ptr<openshot::Frame> GetFrame(int64_t frame_number) override { return GetFrame(std::make_shared<openshot::Frame>(), frame_number); }

/// @brief This method is required for all derived classes of ClipBase, and returns a
/// modified openshot::Frame object
Expand Down
2 changes: 1 addition & 1 deletion src/effects/Wave.h
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ namespace openshot
///
/// @returns A new openshot::Frame object
/// @param frame_number The frame number (starting at 1) of the clip or effect on the timeline.
std::shared_ptr<openshot::Frame> GetFrame(int64_t frame_number) override { return GetFrame(std::shared_ptr<openshot::Frame> (new Frame()), frame_number); }
std::shared_ptr<openshot::Frame> GetFrame(int64_t frame_number) override { return GetFrame(std::make_shared<openshot::Frame>(), frame_number); }

/// @brief This method is required for all derived classes of ClipBase, and returns a
/// modified openshot::Frame object
Expand Down

0 comments on commit 57678ac

Please sign in to comment.