From 2ee2bcff88ce7b4e00e75e95e973959e812a7f61 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 7 Nov 2017 16:13:41 +0100 Subject: [PATCH] movieplayer: don't stop playback with RC_home; it's confusing Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/c3292a491994b83768966d52e07e0633343ac4d5 Author: vanhofen Date: 2017-11-07 (Tue, 07 Nov 2017) Origin message was: ------------------ - movieplayer: don't stop playback with RC_home; it's confusing --- src/gui/movieplayer.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index f6f881572..dc8c8f3fc 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -1796,7 +1796,7 @@ void CMoviePlayerGui::PlayFileLoop(void) if (msg == (neutrino_msg_t) g_settings.mpkey_plugin) { g_Plugins->startPlugin_by_name(g_settings.movieplayer_plugin.c_str ()); - } else if ((msg == (neutrino_msg_t) g_settings.mpkey_stop) || msg == CRCInput::RC_home) { //NI + } else if (msg == (neutrino_msg_t) g_settings.mpkey_stop) { playstate = CMoviePlayerGui::STOPPED; keyPressed = CMoviePlayerGui::PLUGIN_PLAYSTATE_STOP; ClearQueue(); @@ -1871,11 +1871,6 @@ void CMoviePlayerGui::PlayFileLoop(void) g_videoSettings->next43Mode(); } else if (msg == (neutrino_msg_t) g_settings.key_switchformat) { g_videoSettings->SwitchFormat(); - } else if (msg == (neutrino_msg_t) CRCInput::RC_home) { - playstate = CMoviePlayerGui::STOPPED; - playback->RequestAbort(); - filelist.clear(); - repeat_mode = REPEAT_OFF; } else if (msg == (neutrino_msg_t) g_settings.mpkey_play) { if (time_forced) { time_forced = false; @@ -2603,7 +2598,7 @@ void CMoviePlayerGui::handleMovieBrowser(neutrino_msg_t msg, int /*position*/) newComHintBox.movePosition(newx, newy); return; } - else if ((msg == (neutrino_msg_t) g_settings.mpkey_stop) || msg == CRCInput::RC_home) { //NI + else if (msg == (neutrino_msg_t) g_settings.mpkey_stop) { // if we have a movie information, try to save the stop position printf("CMoviePlayerGui::handleMovieBrowser: stop, isMovieBrowser %d p_movie_info %p\n", isMovieBrowser, p_movie_info); if (isMovieBrowser && p_movie_info) {