From 9e7f9ca7390b600c84bf13bbd2d9f1dc35a25468 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Mon, 19 Mar 2018 01:08:30 +0100 Subject: [PATCH] - keybind-setup: sort mpkeys more consistent Signed-off-by: Thilo Graf --- src/gui/keybind_setup.cpp | 10 +++++----- src/gui/keybind_setup.h | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/gui/keybind_setup.cpp b/src/gui/keybind_setup.cpp index 2ab5edd5d..5112ab067 100644 --- a/src/gui/keybind_setup.cpp +++ b/src/gui/keybind_setup.cpp @@ -180,11 +180,11 @@ const key_settings_struct_t key_settings[CKeybindSetup::KEYBINDS_COUNT] = {LOCALE_KEYBINDINGMENU_SUBCHANNELDOWN, &g_settings.key_subchannel_down, LOCALE_MENU_HINT_KEY_SUBCHANNELDOWN }, {LOCALE_KEYBINDINGMENU_ZAPHISTORY, &g_settings.key_zaphistory, LOCALE_MENU_HINT_KEY_HISTORY }, {LOCALE_KEYBINDINGMENU_LASTCHANNEL, &g_settings.key_lastchannel, LOCALE_MENU_HINT_KEY_LASTCHANNEL }, - {LOCALE_MPKEY_REWIND, &g_settings.mpkey_rewind, LOCALE_MENU_HINT_KEY_MPREWIND }, - {LOCALE_MPKEY_FORWARD, &g_settings.mpkey_forward, LOCALE_MENU_HINT_KEY_MPFORWARD }, + {LOCALE_MPKEY_PLAY, &g_settings.mpkey_play, LOCALE_MENU_HINT_KEY_MPPLAY }, {LOCALE_MPKEY_PAUSE, &g_settings.mpkey_pause, LOCALE_MENU_HINT_KEY_MPPAUSE }, {LOCALE_MPKEY_STOP, &g_settings.mpkey_stop, LOCALE_MENU_HINT_KEY_MPSTOP }, - {LOCALE_MPKEY_PLAY, &g_settings.mpkey_play, LOCALE_MENU_HINT_KEY_MPPLAY }, + {LOCALE_MPKEY_FORWARD, &g_settings.mpkey_forward, LOCALE_MENU_HINT_KEY_MPFORWARD }, + {LOCALE_MPKEY_REWIND, &g_settings.mpkey_rewind, LOCALE_MENU_HINT_KEY_MPREWIND }, {LOCALE_MPKEY_AUDIO, &g_settings.mpkey_audio, LOCALE_MENU_HINT_KEY_MPAUDIO }, {LOCALE_MPKEY_SUBTITLE, &g_settings.mpkey_subtitle, LOCALE_MENU_HINT_KEY_MPSUBTITLE }, {LOCALE_MPKEY_TIME, &g_settings.mpkey_time, LOCALE_MENU_HINT_KEY_MPTIME }, @@ -509,7 +509,7 @@ void CKeybindSetup::showKeyBindMovieplayerSetup(CMenuWidget *bindSettings_mplaye { bindSettings_mplayer->addIntroItems(LOCALE_MAINMENU_MOVIEPLAYER); - for (int i = MPKEY_REWIND; i <= MPKEY_PLUGIN; i++) { + for (int i = MPKEY_PLAY; i <= MPKEY_PLUGIN; i++) { CMenuForwarder * mf = new CMenuForwarder(key_settings[i].keydescription, true, keychooser[i]->getKeyName(), keychooser[i]); mf->setHint("", key_settings[i].hint); bindSettings_mplayer->addItem(mf); @@ -581,7 +581,7 @@ bool CKeybindSetup::changeNotify(const neutrino_locale_t OptionName, void * /* d const char *CKeybindSetup::getMoviePlayerButtonName(const neutrino_msg_t key, bool &active, bool return_title) { active = false; - for (unsigned int i = MPKEY_REWIND; i <= MPKEY_PLUGIN; i++) + for (unsigned int i = MPKEY_PLAY; i <= MPKEY_PLUGIN; i++) { if ((uint32_t)*key_settings[i].keyvalue_p == (unsigned int)key) { diff --git a/src/gui/keybind_setup.h b/src/gui/keybind_setup.h index ff3cb1f17..ae0f87f6e 100644 --- a/src/gui/keybind_setup.h +++ b/src/gui/keybind_setup.h @@ -65,11 +65,11 @@ class CKeybindSetup : public CMenuTarget, public CChangeObserver NKEY_SUBCHANNEL_DOWN, NKEY_ZAP_HISTORY, NKEY_LASTCHANNEL, - MPKEY_REWIND, - MPKEY_FORWARD, + MPKEY_PLAY, MPKEY_PAUSE, MPKEY_STOP, - MPKEY_PLAY, + MPKEY_FORWARD, + MPKEY_REWIND, MPKEY_AUDIO, MPKEY_SUBTITLE, MPKEY_TIME,