From cf89891bf0df20ff7228d486cddf2d520b751160 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Mon, 19 Oct 2020 17:42:12 -0400 Subject: [PATCH] Finish conflict resolution --- src/Clip.cpp | 2 +- src/TimelineBase.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Clip.cpp b/src/Clip.cpp index 2830ec4ba..1cffc9b2c 100644 --- a/src/Clip.cpp +++ b/src/Clip.cpp @@ -396,7 +396,7 @@ std::shared_ptr Clip::GetFrame(std::shared_ptr frame, in // Get time mapped frame number (used to increase speed, change direction, etc...) // TODO: Handle variable # of samples, since this resamples audio for different speeds (only when time curve is set) - get_time_mapped_frame(frame, requested_frame); + get_time_mapped_frame(frame, new_frame_number); // Adjust # of samples to match requested (the interaction with time curves will make this tricky) // TODO: Implement move samples to/from next frame diff --git a/src/TimelineBase.cpp b/src/TimelineBase.cpp index cc59a2433..4356167f5 100644 --- a/src/TimelineBase.cpp +++ b/src/TimelineBase.cpp @@ -28,7 +28,7 @@ * along with OpenShot Library. If not, see . */ -#include "../include/TimelineBase.h" +#include "TimelineBase.h" using namespace openshot;