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 
...only build-tested, needs fixes
This commit is contained in:
Stefan Seyfried
2014-02-15 20:22:07 +01:00
parent 3a665f6daf 5707fe19a4
commit ecd62d81d1
77 changed files with 1056 additions and 396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/movieplayer.cpp
View File

@@ -72,7 +72,6 @@
extern cVideo * videoDecoder;
extern CRemoteControl *g_RemoteControl; /* neutrino.cpp */
extern CInfoClock *InfoClock;
extern bool has_hdd;
#define TIMESHIFT_SECONDS 3
@@ -383,8 +382,7 @@ bool CMoviePlayerGui::SelectFile()
full_name = "";
printf("CMoviePlayerGui::SelectFile: isBookmark %d timeshift %d isMovieBrowser %d\n", isBookmark, timeshift, isMovieBrowser);
if (has_hdd)
wakeup_hdd(g_settings.network_nfs_recordingdir.c_str());
wakeup_hdd(g_settings.network_nfs_recordingdir.c_str());
if (timeshift) {
t_channel_id live_channel_id = CZapit::getInstance()->GetCurrentChannelID();
@@ -535,6 +533,7 @@ void CMoviePlayerGui::PlayFile(void)
//CTimeOSD FileTime;
position = 0, duration = 0;
speed = 1;
playstate = CMoviePlayerGui::STOPPED;
printf("Startplay at %d seconds\n", startposition/1000);
@@ -601,7 +600,13 @@ void CMoviePlayerGui::PlayFile(void)
/* playback->Start() starts paused */
if(timeshift == 3) {
speed = -1;
playback->SetSpeed(-1);
playstate = CMoviePlayerGui::REW;
if (!FileTime.IsVisible() && !time_forced) {
FileTime.switchMode(position, duration);
time_forced = true;
}
} else if(!timeshift || !g_settings.timeshift_pause) {
playback->SetSpeed(1);
}