now there's a common baseclass for all remuxers, make use of it

Modified Files:
 Tag: v0_4
	HISTORY remux/ts2pes.c remux/ts2pes.h remux/tsremux.h
	server/livestreamer.c server/livestreamer.h

1 files changed, 3 insertions, 8 deletions

diff --git a/server/livestreamer.h b/server/livestreamer.h
index cf64559..7f442ba 100644
--- a/server/livestreamer.h
+++ b/server/livestreamer.h
@@ -5,13 +5,11 @@
 #include <vdr/receiver.h>
 
 #include "server/streamer.h"
+#include "remux/tsremux.h"
 #include "common.h"
 
 namespace Streamdev {
-	class cTS2PSRemux;
-	class cTS2ESRemux;
-	class cExternRemux;
-	class cTS2PESRemux;
+	class cTSRemux;
 }
 class cStreamdevPatFilter;
 class cStreamdevLiveReceiver;
@@ -29,10 +27,7 @@ private:
 	cDevice                *m_Device;
 	cStreamdevLiveReceiver *m_Receiver;
 	cStreamdevPatFilter    *m_PatFilter;
-	Streamdev::cTS2PESRemux *m_PESRemux;
-	Streamdev::cTS2ESRemux  *m_ESRemux;
-	Streamdev::cTS2PSRemux  *m_PSRemux;
-	Streamdev::cExternRemux *m_ExtRemux;
+	Streamdev::cTSRemux    *m_Remux;
 
 	void StartReceiver(void);
 	bool HasPid(int Pid);