Merge branch 'uncool/dvbsi++' commit 4965619a79

Conflicts:
	src/gui/widget/hintboxext.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
This commit is contained in:
Stefan Seyfried
2012-12-30 21:35:20 +01:00
84 changed files with 898 additions and 314 deletions

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