Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo

Conflicts:
	src/nhttpd/yhttpd.cpp
This commit is contained in:
[CST] Bas
2012-12-07 14:39:05 +08:00
96 changed files with 960 additions and 461 deletions

View File

@@ -1217,7 +1217,7 @@ printf("[neutrino] CSectionsdClient::EVT_GOT_CN_EPG\n");
(trkey == RC_plus ) || (trkey == RC_minus ) ||
(trkey == RC_page_down ) || (trkey == RC_page_up ) ||
((bAllowRepeatLR) && ((trkey == RC_left ) || (trkey == RC_right))) ||
((trkey == RC_standby) && (cs_get_revision() > 7)) )
(g_settings.shutdown_real_rcdelay && ((trkey == RC_standby) && (cs_get_revision() > 7))) )
{
#ifdef ENABLE_REPEAT_CHECK
if (rc_last_repeat_key != ev.code) {