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

neutrino: add more RC_playpause handling

Browse Source 
Conflicts:
	src/gui/movieplayer.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3d5aa5977a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-19 (Tue, 19 Dec 2017)

Origin message was:
------------------
- neutrino: add more RC_playpause handling

 Conflicts:
	src/gui/movieplayer.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-12-19 10:58:44 +01:00
committed by Thilo Graf
parent d94b1d35eb
commit 2a4ff88f8c
9 changed files with 63 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui/movieplayer.cpp
View File

@@ -1580,7 +1580,19 @@ void CMoviePlayerGui::PlayFileLoop(void)
neutrino_msg_data_t data;
g_RCInput->getMsg(&msg, &data, 10); // 1 secs..
// handle CRCInput::RC_playpause key
bool handle_key_play = true;
bool handle_key_pause = true;
#if 0 //bisectional jumps
if (g_settings.mpkey_play == g_settings.mpkey_pause)
{
if (playstate == CMoviePlayerGui::PLAY)
handle_key_play = false;
else if (playstate == CMoviePlayerGui::PAUSE)
handle_key_pause = false;
}
if (bisection_loop > -1)
bisection_loop++;
if (bisection_loop > bisection_loop_max)
@@ -1772,7 +1784,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
} else if (msg == (neutrino_msg_t) g_settings.key_switchformat) {
g_videoSettings->SwitchFormat();
#endif
} else if (msg == (neutrino_msg_t) g_settings.mpkey_play) {
} else if (msg == (neutrino_msg_t) g_settings.mpkey_play && handle_key_play) {
if (time_forced) {
time_forced = false;
FileTimeOSD->kill();
@@ -1816,7 +1828,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
delete playlist;
enableOsdElements(MUTE);
}
} else if (msg == (neutrino_msg_t) g_settings.mpkey_pause) {
} else if (msg == (neutrino_msg_t) g_settings.mpkey_pause && handle_key_pause) {
if (time_forced) {
time_forced = false;
FileTimeOSD->kill();