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

Merge branch 'uncool/dvbsi++'

Browse Source 
Conflicts:
	data/icons/border_lr.png
	data/icons/border_ul.png
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/system/setting_helpers.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: e5e7d52fa1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-23 (Fri, 23 Nov 2012)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2012-11-23 18:45:22 +01:00
parent 7af33af482 060e88ba9f
commit 4edeb50241
40 changed files with 435 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/driver/rcinput.cpp
View File

@@ -1248,11 +1248,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)
#ifndef HAVE_SPARK_HARDWARE
&& (cs_get_revision() > 7)
#endif
))
(g_settings.shutdown_real_rcdelay && ((trkey == RC_standby) && (g_info.hw_caps->can_shutdown))))
{
#ifdef ENABLE_REPEAT_CHECK
if (rc_last_repeat_key != ev.code) {