mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 16:01:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix rc_play / rc_pause handling for osmio

Browse Source 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 39f2d87bfc
Author: Markus Volk <f_l_k@t-online.de>
Date: 2020-03-24 (Tue, 24 Mar 2020)



------------------
This commit was generated by Migit
This commit is contained in:
Markus Volk
2020-03-24 22:25:05 +01:00
committed by vanhofen
parent c5691e40c8
commit d943cb9d82
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/driver/rcinput.cpp
View File

@@ -1761,9 +1761,6 @@ int CRCInput::translate(int code)
#elif BOXMODEL_OSMIO4K || BOXMODEL_OSMIO4KPLUS #elif BOXMODEL_OSMIO4K || BOXMODEL_OSMIO4KPLUS
case KEY_VIDEO: case KEY_VIDEO:
return RC_mode; return RC_mode;
case KEY_PVR:
return RC_pvr;
#endif #endif
case KEY_SWITCHVIDEOMODE: case KEY_SWITCHVIDEOMODE:
return RC_mode; return RC_mode;

4
src/neutrino.cpp
View File

@@ -317,7 +317,7 @@ static SNeutrinoSettings::usermenu_t usermenu_default[] = {
{ CRCInput::RC_green, "6", "", "green" }, { CRCInput::RC_green, "6", "", "green" },
{ CRCInput::RC_yellow, "7,35", "", "yellow" }, { CRCInput::RC_yellow, "7,35", "", "yellow" },
{ CRCInput::RC_blue, "27,28,21,20,1,39,10,11,24,19,14", "", "blue" }, { 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" }, { CRCInput::RC_playpause, "9", "", "5" },
#else #else
{ CRCInput::RC_play, "9", "", "5" }, { 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_rewind = tconfig->getInt32( "mpkey.rewind", CRCInput::RC_rewind );
g_settings.mpkey_forward = tconfig->getInt32( "mpkey.forward", CRCInput::RC_forward ); g_settings.mpkey_forward = tconfig->getInt32( "mpkey.forward", CRCInput::RC_forward );
g_settings.mpkey_stop = tconfig->getInt32( "mpkey.stop", CRCInput::RC_stop ); 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_play = tconfig->getInt32( "mpkey.play", CRCInput::RC_playpause );
g_settings.mpkey_pause = tconfig->getInt32( "mpkey.pause", CRCInput::RC_playpause ); g_settings.mpkey_pause = tconfig->getInt32( "mpkey.pause", CRCInput::RC_playpause );
#elif BOXMODEL_VUPLUS #elif BOXMODEL_VUPLUS