From 714cca6ba6d896f759c9ba1cfe5a33486701b702 Mon Sep 17 00:00:00 2001 From: GetAway Date: Sat, 26 May 2018 17:59:18 +0200 Subject: [PATCH] movieplayer.cpp: fix handle key play/pause for arm --- src/driver/rcinput.cpp | 2 -- src/gui/movieplayer.cpp | 7 +++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/driver/rcinput.cpp b/src/driver/rcinput.cpp index 4275a8612..a39363331 100644 --- a/src/driver/rcinput.cpp +++ b/src/driver/rcinput.cpp @@ -1724,8 +1724,6 @@ int CRCInput::translate(int code) return RC_up; case 0x101: // FIXME -- needed? return RC_down; - case KEY_PLAYPAUSE: - return RC_play; case KEY_PROGRAM: return RC_timer; case KEY_CHANNELUP: diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index 0b8c3ad2a..88c1b448c 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -1512,6 +1512,13 @@ void CMoviePlayerGui::PlayFileLoop(void) // handle CRCInput::RC_playpause key bool handle_key_play = true; bool handle_key_pause = true; + 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 0 //bisectional jumps if (g_settings.mpkey_play == g_settings.mpkey_pause)