mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-03 10:51:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/gui/movieplayer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: c188cf3683
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-26 (Sun, 26 Feb 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-02-26 22:35:47 +01:00
parent 2623c0d848 9ca012f83a
commit dff4ea2892
13 changed files with 454 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/gui/movieplayer.cpp
View File

@@ -1349,9 +1349,12 @@ void CMoviePlayerGui::PlayFileLoop(void)
bool first_start = true;
bool update_lcd = true;
int eof = 0;
int eof2 = 0;
int position_tmp = 0;
int lastpos = 0;
bool at_eof = !(playstate >= CMoviePlayerGui::PLAY);;
keyPressed = CMoviePlayerGui::PLUGIN_PLAYSTATE_NORMAL;
while (playstate >= CMoviePlayerGui::PLAY)
{
if (update_lcd) {
@@ -1388,6 +1391,20 @@ void CMoviePlayerGui::PlayFileLoop(void)
}
#endif
/* in case ffmpeg report incorrect values */
if((playstate == CMoviePlayerGui::PLAY) && (speed == 1)){
if(position_tmp != position){
position_tmp = position ;
eof2 = 0;
}else{
if (++eof2 > 6) {
at_eof = true;
break;
}
}
}
else{
eof2 = 0;
}
int posdiff = duration - position;
if ((posdiff >= 0) && (posdiff < 2000) && timeshift == TSHIFT_MODE_OFF)
{