From d943cb9d82e9ce54d8a9cb35c74b257488954b30 Mon Sep 17 00:00:00 2001 From: Markus Volk Date: Tue, 24 Mar 2020 22:25:05 +0100 Subject: [PATCH] fix rc_play / rc_pause handling for osmio Conflicts: src/neutrino.cpp Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/39f2d87bfca08dae23376a94df237ba97d438591 Author: Markus Volk Date: 2020-03-24 (Tue, 24 Mar 2020) ------------------ This commit was generated by Migit --- src/driver/rcinput.cpp | 3 --- src/neutrino.cpp | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/driver/rcinput.cpp b/src/driver/rcinput.cpp index 91ae2d1f1..deb5ea7c8 100644 --- a/src/driver/rcinput.cpp +++ b/src/driver/rcinput.cpp @@ -1761,9 +1761,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 75550936e..ad12aff62 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -317,7 +317,7 @@ static SNeutrinoSettings::usermenu_t usermenu_default[] = { { CRCInput::RC_green, "6", "", "green" }, { CRCInput::RC_yellow, "7,35", "", "yellow" }, { CRCInput::RC_blue, "27,28,21,20,1,39,10,11,24,19,14", "", "blue" }, -#if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_OSMIO4K || BOXMODEL_OSMIO4KPLUS +#if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 { CRCInput::RC_playpause, "9", "", "5" }, #else { CRCInput::RC_play, "9", "", "5" }, @@ -5458,7 +5458,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_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_OSMIO4K || BOXMODEL_OSMIO4KPLUS +#if BOXMODEL_HD51 || BOXMODEL_HD60 || 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