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

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

Browse Source 
Conflicts:
	configure.ac
	src/driver/Makefile.am
	src/driver/framebuffer.h
	src/gui/bookmarkmanager.cpp
	src/gui/filebrowser.cpp
	src/gui/widget/buttons.cpp
	src/system/httptool.cpp


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



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-02-09 13:19:03 +01:00
parent 2f63d963eb 695c7d3df9
commit c80102a917
132 changed files with 4170 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/movieplayer.cpp
View File

@@ -54,6 +54,7 @@
#include <driver/abstime.h>
#include <driver/record.h>
#include <driver/volume.h>
#include <driver/fontrenderer.h>
#include <eitd/edvbstring.h>
#include <system/helpers.h>
@@ -329,6 +330,7 @@ int CMoviePlayerGui::exec(CMenuTarget * parent, const std::string & actionKey)
FileTimeOSD->kill();
FileTimeOSD->setMode(CTimeOSD::MODE_HIDE);
FileTimeOSD->setMpTimeForced(false);
time_forced = false;
if (actionKey == "tsmoviebrowser") {
@@ -1164,6 +1166,7 @@ bool CMoviePlayerGui::PlayFileStart(void)
{
menu_ret = menu_return::RETURN_REPAINT;
FileTimeOSD->setMpTimeForced(false);
time_forced = false;
position = 0, duration = 0;
@@ -1265,6 +1268,7 @@ bool CMoviePlayerGui::PlayFileStart(void)
FileTimeOSD->switchMode(position, duration);
time_forced = true;
}
FileTimeOSD->setMpTimeForced(true);
} else if (timeshift == TSHIFT_MODE_OFF || !g_settings.timeshift_pause) {
playback->SetSpeed(1);
}
@@ -1470,6 +1474,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
time_forced = false;
FileTimeOSD->kill();
}
FileTimeOSD->setMpTimeForced(false);
if (playstate > CMoviePlayerGui::PLAY) {
playstate = CMoviePlayerGui::PLAY;
speed = 1;
@@ -1504,6 +1509,11 @@ void CMoviePlayerGui::PlayFileLoop(void)
enableOsdElements(MUTE);
}
} else if (msg == (neutrino_msg_t) g_settings.mpkey_pause) {
if (time_forced) {
time_forced = false;
FileTimeOSD->kill();
}
FileTimeOSD->setMpTimeForced(false);
if (playstate == CMoviePlayerGui::PAUSE) {
playstate = CMoviePlayerGui::PLAY;
//CVFD::getInstance()->ShowIcon(VFD_ICON_PAUSE, false);
@@ -1535,6 +1545,8 @@ void CMoviePlayerGui::PlayFileLoop(void)
update_lcd = true;
} else if (msg == (neutrino_msg_t) g_settings.mpkey_time) {
FileTimeOSD->switchMode(position, duration);
time_forced = false;
FileTimeOSD->setMpTimeForced(false);
} else if (msg == (neutrino_msg_t) g_settings.mbkey_cover) {
makeScreenShot(false, true);
} else if (msg == (neutrino_msg_t) g_settings.key_screenshot) {
@@ -1560,6 +1572,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
FileTimeOSD->switchMode(position, duration);
time_forced = true;
}
FileTimeOSD->setMpTimeForced(true);
if (timeshift == TSHIFT_MODE_OFF)
callInfoViewer();
} else if (msg == CRCInput::RC_1) { // Jump Backwards 1 minute