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
------------------
Commit: e5e7d52fa1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-23 (Fri, 23 Nov 2012)
This commit is contained in:
Stefan Seyfried
2012-11-23 18:45:22 +01:00
parent 8cd0502cc1 71637be190
commit 8baeccb8a1
40 changed files with 435 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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