mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-31 09:21:18 +02:00
- some playpause fixes for BOXMODEL_PROTEK4K
Conflicts: src/neutrino.cpp
This commit is contained in:
@@ -339,7 +339,7 @@ static SNeutrinoSettings::usermenu_t usermenu_default[] = {
|
||||
{ CRCInput::RC_green, "6", "", "green" },
|
||||
{ CRCInput::RC_yellow, "7,36", "", "yellow" },
|
||||
{ CRCInput::RC_blue, "12,11,20,21,19,14,30,15,35", "", "blue" },
|
||||
#if BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_MULTIBOX || BOXMODEL_MULTIBOXSE
|
||||
#if BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_PROTEK4K || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_MULTIBOX || BOXMODEL_MULTIBOXSE
|
||||
{ CRCInput::RC_playpause, "9", "", "5" },
|
||||
#else
|
||||
{ CRCInput::RC_play, "9", "", "5" },
|
||||
@@ -5766,7 +5766,7 @@ void CNeutrinoApp::loadKeys(const char *fname)
|
||||
g_settings.key_subchannel_down = tconfig->getInt32("key_subchannel_down", CRCInput::RC_left);
|
||||
g_settings.key_subchannel_up = tconfig->getInt32("key_subchannel_up", CRCInput::RC_right);
|
||||
g_settings.key_switchformat = tconfig->getInt32("key_switchformat", CRCInput::RC_nokey);
|
||||
#if BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_MULTIBOX || BOXMODEL_MULTIBOXSE || BOXMODEL_OSMIO4K || BOXMODEL_OSMIO4KPLUS
|
||||
#if BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_PROTEK4K || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_MULTIBOX || BOXMODEL_MULTIBOXSE || 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);
|
||||
@@ -5796,7 +5796,7 @@ void CNeutrinoApp::loadKeys(const char *fname)
|
||||
g_settings.mpkey_forward = tconfig->getInt32("mpkey.forward", CRCInput::RC_forward);
|
||||
g_settings.mpkey_goto = tconfig->getInt32("mpkey.goto", CRCInput::RC_nokey);
|
||||
g_settings.mpkey_next_repeat_mode = tconfig->getInt32("mpkey.next_repeat_mode", CRCInput::RC_nokey);
|
||||
#if BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_MULTIBOX || BOXMODEL_MULTIBOXSE
|
||||
#if BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_PROTEK4K || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_MULTIBOX || BOXMODEL_MULTIBOXSE
|
||||
g_settings.mpkey_pause = tconfig->getInt32("mpkey.pause", CRCInput::RC_playpause);
|
||||
g_settings.mpkey_play = tconfig->getInt32("mpkey.play", CRCInput::RC_playpause);
|
||||
#elif BOXMODEL_VUPLUS_ALL
|
||||
|
Reference in New Issue
Block a user