Merge remote-tracking branch 'check/next-cc'

needs buildfixing...

Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/infoclock.cpp
	src/gui/infoviewer.cpp
	src/gui/motorcontrol.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/update.cpp
	src/gui/widget/progresswindow.cpp
	src/gui/widget/textbox.cpp
	src/neutrino.cpp
	src/zapit/include/zapit/femanager.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 32de6beef0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-01 (Sun, 01 Sep 2013)



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

src/timerd/timermanager.cpp

@@ -727,11 +727,12 @@ bool CTimerManager::shutdown()
 void CTimerManager::shutdownOnWakeup(int currEventID)
 {
 	time_t nextAnnounceTime=0;
-	if(wakeup == 0)
-		return;
 
-	wakeup = 0;
 	pthread_mutex_lock(&tm_eventsMutex);
+	if(wakeup == 0) {
+		pthread_mutex_unlock(&tm_eventsMutex);
+		return;
+	}
 
 	CTimerEventMap::iterator pos = events.begin();
 	for(;pos != events.end();++pos)
@@ -756,10 +757,23 @@ void CTimerManager::shutdownOnWakeup(int currEventID)
 	{ // in den naechsten 10 min steht nix an
 		dprintf("Programming shutdown event\n");
 		CTimerEvent_Shutdown* event = new CTimerEvent_Shutdown(now+120, now+180);
-		addEvent(event);
+		shutdown_eventID = addEvent(event);
+		wakeup = 0;
 	}
 	pthread_mutex_unlock(&tm_eventsMutex);
 }
+
+void CTimerManager::cancelShutdownOnWakeup()
+{
+	pthread_mutex_lock(&tm_eventsMutex);
+	if (shutdown_eventID > -1) {
+		removeEvent(shutdown_eventID);
+		shutdown_eventID = -1;
+	}
+	wakeup = 0;
+	pthread_mutex_unlock(&tm_eventsMutex);
+}
+
 void CTimerManager::setRecordingSafety(int pre, int post)
 {
 	m_extraTimeStart=pre;

src/timerd/timermanager.h

@@ -212,6 +212,7 @@ class CTimerManager
 private:
 	void Init(void);
 	int					eventID;
+	int					shutdown_eventID;
 	CEventServer		*eventServer;
 	CTimerEventMap		events;
 	pthread_t			thrTimer;
@@ -247,6 +248,7 @@ public:
 	void getRecordingSafety(int &pre, int &post){pre=m_extraTimeStart;post=m_extraTimeEnd;}
 	void setRecordingSafety(int pre, int post);
 	void loadRecordingSafety();
+	void cancelShutdownOnWakeup();
 };
 
 #endif