Merge branch 'switch_livetv'

Conflicts:
	HISTORY
	server/connection.c

1 files changed, 6 insertions, 0 deletions

diff --git a/server/connection.h b/server/connection.h
index 01a070c..6cc6764 100644
--- a/server/connection.h
+++ b/server/connection.h
@@ -15,6 +15,7 @@ typedef std::pair<std::string,std::string> tStrStr;
 
 class cChannel;
 class cDevice;
+class cSwitchLive;
 
 /* Basic capabilities of a straight text-based protocol, most functions
    virtual to support more complicated protocols */
@@ -33,6 +34,8 @@ private:
 	uint        m_WriteBytes;
 	uint        m_WriteIndex;
 
+	cSwitchLive *m_SwitchLive;
+
 	tStrStrMap  m_Headers;
 
 	/* Check if a device would be available for transfering the given
@@ -108,6 +111,9 @@ public:
 	/* Test if a call to GetDevice would return a usable device. */
 	bool ProvidesChannel(const cChannel *Channel, int Priority);
 
+	/* Do things which must be done in VDR's main loop */
+	void MainThreadHook();
+
 	virtual void Flushed(void) {}
 
 	virtual void Detach(void) = 0;