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

movieplayer: fix RC_ok handling while infoviewer is displayed; ...

Browse Source 
If filelist is empty or movie in filelist wasn't changed, just quit infoviewer
as in tv-mode. Otherwise start choosen movie.


Origin commit data
------------------
Branch: ni/coolstream
Commit: a1a028704b
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-02-20 (Tue, 20 Feb 2018)

Origin message was:
------------------
- movieplayer: fix RC_ok handling while infoviewer is displayed; ...

If filelist is empty or movie in filelist wasn't changed, just quit infoviewer
as in tv-mode. Otherwise start choosen movie.


------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2018-02-20 20:36:42 +01:00
parent 6f7cc47f7c
commit 931f1a898e
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/movieplayer.cpp
View File

@@ -1660,11 +1660,14 @@ void CMoviePlayerGui::PlayFileLoop(void)
quickZap(msg); quickZap(msg);
} else if (msg == CRCInput::RC_previoussong || msg == CRCInput::RC_nextsong) { } else if (msg == CRCInput::RC_previoussong || msg == CRCInput::RC_nextsong) {
quickZap(msg); quickZap(msg);
} else if (fromInfoviewer && msg == CRCInput::RC_ok && !filelist.empty()) { } else if (fromInfoviewer && msg == CRCInput::RC_ok) {
printf("CMoviePlayerGui::%s: start playlist movie #%d\n", __func__, (int)(vzap_it - filelist.begin())); if (!filelist.empty() && (filelist_it != vzap_it))
{
printf("CMoviePlayerGui::%s: start playlist movie #%d\n", __func__, (int)(vzap_it - filelist.begin()));
playstate = CMoviePlayerGui::STOPPED;
filelist_it = vzap_it;
}
fromInfoviewer = false; fromInfoviewer = false;
playstate = CMoviePlayerGui::STOPPED;
filelist_it = vzap_it;
} else if (timeshift == TSHIFT_MODE_OFF && !isWebChannel /* && !isYT */ && (msg == (neutrino_msg_t) g_settings.mpkey_next_repeat_mode)) { } else if (timeshift == TSHIFT_MODE_OFF && !isWebChannel /* && !isYT */ && (msg == (neutrino_msg_t) g_settings.mpkey_next_repeat_mode)) {
repeat_mode = (repeat_mode_enum)((int)repeat_mode + 1); repeat_mode = (repeat_mode_enum)((int)repeat_mode + 1);
if (repeat_mode > (int) REPEAT_ALL) if (repeat_mode > (int) REPEAT_ALL)