add hisilicon; re-add hd61

Conflicts:
	acinclude.m4
	src/neutrino.cpp
This commit is contained in:
TangoCash
2020-10-03 19:06:43 +02:00
committed by Thilo Graf
parent 7f850f933b
commit fb1f44089c
3 changed files with 20 additions and 5 deletions

View File

@@ -5304,7 +5304,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_end = tconfig->getInt32( "key_list_end", (unsigned int)CRCInput::RC_nokey );
#if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7
#if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_OSMIO4K || BOXMODEL_OSMIO4KPLUS
g_settings.key_timeshift = tconfig->getInt32( "key_timeshift", CRCInput::RC_nokey ); // FIXME
#elif BOXMODEL_VUPLUS_ALL
g_settings.key_timeshift = tconfig->getInt32( "key_timeshift", CRCInput::RC_playpause );