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

remove unsupported BOXMODEL_HD61

Browse Source 
Origin commit data
------------------
Commit: 74f12bb199
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-02-27 (Thu, 27 Feb 2020)

Origin message was:
------------------
- remove unsupported BOXMODEL_HD61
This commit is contained in:
vanhofen
2020-02-27 22:07:33 +01:00
parent 44f19e269c
commit f1c074fc83
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/driver/rcinput.cpp
View File

@@ -1752,7 +1752,7 @@ int CRCInput::translate(int code)
case KEY_CHANNELDOWN: case KEY_CHANNELDOWN:
return RC_page_down; return RC_page_down;
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE #if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
#if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_OSMIO4K || BOXMODEL_OSMIO4KPLUS #if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_OSMIO4K || BOXMODEL_OSMIO4KPLUS
case KEY_VIDEO: case KEY_VIDEO:
return RC_favorites; return RC_favorites;
#endif #endif

6
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_HD61 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_OSMIO4K || BOXMODEL_OSMIO4KPLUS #if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_OSMIO4K || BOXMODEL_OSMIO4KPLUS
{ CRCInput::RC_playpause, "9", "", "5" }, { CRCInput::RC_playpause, "9", "", "5" },
#else #else
{ CRCInput::RC_play, "9", "", "5" }, { CRCInput::RC_play, "9", "", "5" },
@@ -5404,7 +5404,7 @@ 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_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 ); 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_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_OSMIO4K || BOXMODEL_OSMIO4KPLUS
g_settings.key_timeshift = tconfig->getInt32( "key_timeshift", CRCInput::RC_nokey ); // FIXME g_settings.key_timeshift = tconfig->getInt32( "key_timeshift", CRCInput::RC_nokey ); // FIXME
#elif BOXMODEL_VUPLUS #elif BOXMODEL_VUPLUS
g_settings.key_timeshift = tconfig->getInt32( "key_timeshift", CRCInput::RC_playpause ); g_settings.key_timeshift = tconfig->getInt32( "key_timeshift", CRCInput::RC_playpause );
@@ -5439,7 +5439,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_HD61 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_OSMIO4K || BOXMODEL_OSMIO4KPLUS #if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_OSMIO4K || BOXMODEL_OSMIO4KPLUS
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

2
src/nhttpd/tuxboxapi/controlapi.cpp
View File

@@ -905,7 +905,7 @@ unsigned int revert_translate(unsigned int code)
case RC_page_down: case RC_page_down:
return KEY_CHANNELDOWN; return KEY_CHANNELDOWN;
#ifdef HAVE_ARM_HARDWARE #ifdef HAVE_ARM_HARDWARE
#if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_OSMIO4K || BOXMODEL_OSMIO4KPLUS #if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_OSMIO4K || BOXMODEL_OSMIO4KPLUS
case RC_favorites: case RC_favorites:
return KEY_VIDEO; return KEY_VIDEO;
#endif #endif

2
src/system/helpers.cpp
View File

@@ -2064,7 +2064,7 @@ int getActivePartition()
} }
fclose(f); fclose(f);
} }
#elif BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_OSMIO4K || BOXMODEL_OSMIO4KPLUS #elif BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_OSMIO4K || BOXMODEL_OSMIO4KPLUS
FILE *f; FILE *f;
// first check for subdirboot layout // first check for subdirboot layout
f = fopen("/sys/firmware/devicetree/base/chosen/bootargs", "r"); f = fopen("/sys/firmware/devicetree/base/chosen/bootargs", "r");