mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-03 19:01:25 +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
This commit is contained in:
Stefan Seyfried
2012-11-23 18:45:22 +01:00
parent e0282a0537 3d72e26214
commit e5e7d52fa1
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) {

6
src/driver/streamts.cpp
View File

@@ -127,7 +127,7 @@ bool CStreamInstance::Send(ssize_t r)
if (ret != r) {
if (r < 0)
perror("send");
printf("send err, fd %d: %d\n", *it, (int)r);
printf("send err, fd %d: (%d from %d)\n", *it, ret, (int)r);
}
}
mutex.unlock();
@@ -353,8 +353,8 @@ bool CStreamManager::Parse(int fd, stream_pids_t &pids, t_channel_id &chid)
}
}
}
if(CRecordManager::getInstance()->RecordingStatus(tmpid)) {
printf("CStreamManager::Parse: channel %" PRIx64 " recorded, aborting..\n", tmpid);
if(CRecordManager::getInstance()->RecordingStatus(chid)) {
printf("CStreamManager::Parse: channel %" PRIx64 " recorded, aborting..\n", chid);
return false;
}
#endif