From 03d8af2fb1446e7b1ab7e7c44a5905308c8ff248 Mon Sep 17 00:00:00 2001 From: Markus Volk Date: Sun, 15 Mar 2020 06:37:11 +0100 Subject: [PATCH] fix rc_play / rc_pause handling for osmio --- src/driver/rcinput.cpp | 3 --- src/neutrino.cpp | 8 +++++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/driver/rcinput.cpp b/src/driver/rcinput.cpp index 03271ec3d..854fc0f91 100644 --- a/src/driver/rcinput.cpp +++ b/src/driver/rcinput.cpp @@ -1753,9 +1753,6 @@ int CRCInput::translate(int code) #elif BOXMODEL_OSMIO4K || BOXMODEL_OSMIO4KPLUS case KEY_VIDEO: return RC_mode; - case KEY_PVR: - return RC_pvr; - #endif case KEY_SWITCHVIDEOMODE: return RC_mode; diff --git a/src/neutrino.cpp b/src/neutrino.cpp index d44ae464d..a2a07f558 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -316,7 +316,7 @@ static SNeutrinoSettings::usermenu_t usermenu_default[] = { { CRCInput::RC_green, "6", "", "green" }, { CRCInput::RC_yellow, "7,32", "", "yellow" }, { CRCInput::RC_blue, "12,11,20,21,19,14,29,30,15,35", "", "blue" }, -#if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_OSMIO4K || BOXMODEL_OSMIO4KPLUS +#if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 { CRCInput::RC_playpause, "9", "", "5" }, #else { CRCInput::RC_play, "9", "", "5" }, @@ -5206,10 +5206,12 @@ void CNeutrinoApp::loadKeys(const char * fname) g_settings.key_list_start = tconfig->getInt32( "key_list_start", (unsigned int)CRCInput::RC_nokey ); g_settings.key_list_end = tconfig->getInt32( "key_list_end", (unsigned int)CRCInput::RC_nokey ); -#if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_OSMIO4K || BOXMODEL_OSMIO4KPLUS +#if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 g_settings.key_timeshift = tconfig->getInt32( "key_timeshift", CRCInput::RC_nokey ); // FIXME #elif BOXMODEL_VUPLUS g_settings.key_timeshift = tconfig->getInt32( "key_timeshift", CRCInput::RC_playpause ); +#elif BOXMODEL_OSMIO4K || BOXMODEL_OSMIO4KPLUS + g_settings.key_timeshift = tconfig->getInt32( "key_timeshift", CRCInput::RC_play ); #else g_settings.key_timeshift = tconfig->getInt32( "key_timeshift", CRCInput::RC_pause ); #endif @@ -5241,7 +5243,7 @@ void CNeutrinoApp::loadKeys(const char * fname) g_settings.mpkey_rewind = tconfig->getInt32( "mpkey.rewind", CRCInput::RC_rewind ); g_settings.mpkey_forward = tconfig->getInt32( "mpkey.forward", CRCInput::RC_forward ); g_settings.mpkey_stop = tconfig->getInt32( "mpkey.stop", CRCInput::RC_stop ); -#if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_OSMIO4K || BOXMODEL_OSMIO4KPLUS +#if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 g_settings.mpkey_play = tconfig->getInt32( "mpkey.play", CRCInput::RC_playpause ); g_settings.mpkey_pause = tconfig->getInt32( "mpkey.pause", CRCInput::RC_playpause ); #elif BOXMODEL_VUPLUS