Merge pull request #314 from SuslikV/patch-8

Fix return type mismatch in PlayerBase/QtPlayer::Position()
This commit is contained in:
Frank Dana
2019-08-25 04:03:24 -04:00
committed by GitHub
3 changed files with 3 additions and 3 deletions

View File

@@ -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;

View File

@@ -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);

View File

@@ -127,7 +127,7 @@ void QtPlayer::Pause()
Speed(0);
}
int QtPlayer::Position()
int64_t QtPlayer::Position()
{
return p->video_position;
}