From 16ca3aef32d4ede6de64eb05c7b79629a11b13d5 Mon Sep 17 00:00:00 2001 From: SuslikV Date: Sat, 24 Aug 2019 10:48:23 +0300 Subject: [PATCH] Fix return type mismatch --- include/PlayerBase.h | 2 +- include/QtPlayer.h | 2 +- src/QtPlayer.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/PlayerBase.h b/include/PlayerBase.h index f017c3f2..3438fdab 100644 --- a/include/PlayerBase.h +++ b/include/PlayerBase.h @@ -81,7 +81,7 @@ namespace openshot virtual void Pause() = 0; /// Get the current frame number being played - virtual int Position() = 0; + virtual int64_t Position() = 0; /// Seek to a specific frame in the player virtual void Seek(int64_t new_frame) = 0; diff --git a/include/QtPlayer.h b/include/QtPlayer.h index 5d0beba6..3339dbf5 100644 --- a/include/QtPlayer.h +++ b/include/QtPlayer.h @@ -81,7 +81,7 @@ namespace openshot void Pause(); /// Get the current frame number being played - int Position(); + int64_t Position(); /// Seek to a specific frame in the player void Seek(int64_t new_frame); diff --git a/src/QtPlayer.cpp b/src/QtPlayer.cpp index c53de79d..05204a6c 100644 --- a/src/QtPlayer.cpp +++ b/src/QtPlayer.cpp @@ -127,7 +127,7 @@ void QtPlayer::Pause() Speed(0); } -int QtPlayer::Position() +int64_t QtPlayer::Position() { return p->video_position; }