mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 17:01:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	src/nhttpd/yhttpd.cpp
This commit is contained in:
[CST] Bas
2012-12-07 14:39:05 +08:00
parent ed45fd56bb 5fc0d256f4
commit 9448cd8d2a
96 changed files with 960 additions and 461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/driver/rcinput.cpp
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) {

6
src/driver/record.cpp
View File

@@ -1650,18 +1650,18 @@ void CRecordManager::RestoreNeutrino(void)
g_Sectionsd->setPauseScanning(false);
}
bool CRecordManager::IsFileRecord(std::string file)
CRecordInstance* CRecordManager::getRecordInstance(std::string file)
{
mutex.lock();
for(recmap_iterator_t it = recmap.begin(); it != recmap.end(); it++) {
CRecordInstance * inst = it->second;
if ((((std::string)inst->GetFileName()) + ".ts") == file) {
mutex.unlock();
return true;
return inst;
}
}
mutex.unlock();
return false;
return NULL;
}
#if 0

2
src/driver/record.h
View File

@@ -218,7 +218,7 @@ class CRecordManager : public CMenuTarget /*, public CChangeObserver*/
int GetRecordCount() { return recmap.size(); };
void StartTimeshift();
int GetRecordMode(const t_channel_id channel_id=0);
bool IsFileRecord(std::string file);
CRecordInstance* getRecordInstance(std::string file);
// old code
#if 0
bool IsTimeshift(t_channel_id channel_id=0);

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, r);
printf("send err, fd %d: (%d from %d)\n", *it, ret, r);
}
}
mutex.unlock();
@@ -346,8 +346,8 @@ bool CStreamManager::Parse(int fd, stream_pids_t &pids, t_channel_id &chid)
}
}
}
if(CRecordManager::getInstance()->RecordingStatus(tmpid)) {
printf("CStreamManager::Parse: channel %llx recorded, aborting..\n", tmpid);
if(CRecordManager::getInstance()->RecordingStatus(chid)) {
printf("CStreamManager::Parse: channel %llx recorded, aborting..\n", chid);
return false;
}
#endif