mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-31 09:21:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix rc_play / rc_pause handling for osmio

Browse Source
This commit is contained in:
Markus Volk
2020-03-15 06:37:11 +01:00
parent 0ef29d2934
commit 03d8af2fb1
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/neutrino.cpp
View File

@@ -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