Skip to content

Commit 5e1e8ce

Browse files
authored
Merge pull request #314 from SuslikV/patch-8
Fix return type mismatch in PlayerBase/QtPlayer::Position()
2 parents 857297a + 16ca3ae commit 5e1e8ce

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

include/PlayerBase.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ namespace openshot
8181
virtual void Pause() = 0;
8282

8383
/// Get the current frame number being played
84-
virtual int Position() = 0;
84+
virtual int64_t Position() = 0;
8585

8686
/// Seek to a specific frame in the player
8787
virtual void Seek(int64_t new_frame) = 0;

include/QtPlayer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ namespace openshot
8181
void Pause();
8282

8383
/// Get the current frame number being played
84-
int Position();
84+
int64_t Position();
8585

8686
/// Seek to a specific frame in the player
8787
void Seek(int64_t new_frame);

src/QtPlayer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ void QtPlayer::Pause()
127127
Speed(0);
128128
}
129129

130-
int QtPlayer::Position()
130+
int64_t QtPlayer::Position()
131131
{
132132
return p->video_position;
133133
}

0 commit comments

Comments
 (0)