Merge branch 'uncool/dvbsi++' commit c6136d612f

Conflicts:
	src/gui/widget/hintboxext.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: f8f5467fdb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-12-30 (Sun, 30 Dec 2012)



------------------
This commit was generated by Migit

src/driver/record.cpp

@@ -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