mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 08:51:10 +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.

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

# Conflicts:
#	src/gui/movieplayer.cpp
This commit is contained in:
svenhoefer
2018-02-20 20:36:42 +01:00
committed by Thilo Graf
parent 7a93447496
commit 7c3c4ab446
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

@@ -1646,11 +1646,14 @@ void CMoviePlayerGui::PlayFileLoop(void)
} }
} else if (msg == (neutrino_msg_t) g_settings.key_quickzap_up || msg == (neutrino_msg_t) g_settings.key_quickzap_down) { } else if (msg == (neutrino_msg_t) g_settings.key_quickzap_up || msg == (neutrino_msg_t) g_settings.key_quickzap_down) {
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)