mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-01 01:41:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'check/next-cc'

Browse Source 
untested, probably needs some buildfixing
This commit is contained in:
Stefan Seyfried
2013-12-22 21:25:05 +01:00
parent 97fef4e52b 31f93c4740
commit 7d87ce9c54
67 changed files with 1637 additions and 894 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/movieplayer.cpp
View File

@@ -156,6 +156,11 @@ void CMoviePlayerGui::Init(void)
timeshift = 0;
numpida = 0;
showStartingHint = false;
min_x = 0;
max_x = 0;
min_y = 0;
max_y = 0;
}
void CMoviePlayerGui::cutNeutrino()
@@ -622,6 +627,7 @@ void CMoviePlayerGui::PlayFile(void)
if ((playstate >= CMoviePlayerGui::PLAY) && (timeshift || (playstate != CMoviePlayerGui::PAUSE))) {
if(playback->GetPosition(position, duration)) {
FileTime.update(position, duration);
if(duration > 100)
file_prozent = (unsigned char) (position / (duration / 100));
#if HAVE_TRIPLEDRAGON