fix playpause handling

Origin commit data
------------------
Branch: ni/coolstream
Commit: ad57d291bb
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-10-23 (Wed, 23 Oct 2019)

Origin message was:
------------------
- fix playpause handling

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2019-10-23 23:22:22 +02:00
parent 57b4b76d82
commit b9a20b4fba

View File

@@ -317,7 +317,7 @@ static SNeutrinoSettings::usermenu_t usermenu_default[] = {
{ CRCInput::RC_green, "6", "", "green" },
{ CRCInput::RC_yellow, "7,35", "", "yellow" },
{ CRCInput::RC_blue, "27,28,21,20,1,39,10,11,24,19,14", "", "blue" },
#if HAVE_ARM_HARDWARE
#if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7
{ CRCInput::RC_playpause, "9", "", "5" },
#else
{ CRCInput::RC_play, "9", "", "5" },
@@ -5253,7 +5253,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_BRE2ZE4K || BOXMODEL_H7
#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 );
@@ -5288,7 +5288,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_BRE2ZE4K || BOXMODEL_H7
#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