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

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

src/driver/rcinput.h

@@ -39,7 +39,7 @@
 #include <string>
 #include <vector>
 #ifdef HAVE_COOLSTREAM_NEVIS_IR_H
-#include <coolstream/nevis_ir.h>
+#include <nevis_ir.h>
 #endif
 
 #ifndef KEY_OK

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

src/driver/record.h

@@ -223,7 +223,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);

src/driver/vfd.h

@@ -42,7 +42,7 @@
 
 #include <pthread.h>
 #include <string>
-#include <coolstream/cs_vfd.h>
+#include <cs_vfd.h>
 
 class CVFD
 {