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

Merge branch 'neutrino-apollo' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo

Browse Source 
Conflicts:
	src/timerd/timermanager.cpp


Origin commit data
------------------
Commit: a222240dbb
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-09-26 (Wed, 26 Sep 2012)
This commit is contained in:
[CST] Bas
2012-09-26 17:52:47 +08:00
parent 8b523be32e 5fdabf2554
commit 8965dc519f
15 changed files with 163 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/movieplayer.cpp
View File

@@ -432,7 +432,7 @@ void CMoviePlayerGui::PlayFile(void)
playback->Close();
} else {
playstate = CMoviePlayerGui::PLAY;
CVFD::getInstance()->ShowIcon(VFD_ICON_PLAY, true);
CVFD::getInstance()->ShowIcon(FP_ICON_PLAY, true);
if(timeshift) {
first_start_timeshift = true;
startposition = -1;
@@ -679,8 +679,8 @@ void CMoviePlayerGui::PlayFile(void)
playback->SetSpeed(1);
playback->Close();
CVFD::getInstance()->ShowIcon(VFD_ICON_PLAY, false);
CVFD::getInstance()->ShowIcon(VFD_ICON_PAUSE, false);
CVFD::getInstance()->ShowIcon(FP_ICON_PLAY, false);
CVFD::getInstance()->ShowIcon(FP_ICON_PAUSE, false);
restoreNeutrino();