Merge branch 'bug_615_replace_rawfile' into m2ts_test

7 files changed, 13 insertions, 13 deletions

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index c980ac5a..414ab8da 100644
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -1753,7 +1753,7 @@ RESULT eDVBChannel::getCurrentFrontendParameters(ePtr<iDVBFrontendParameters> &p
 RESULT eDVBChannel::playFile(const char *file)
 {
 	eRawFile *f = new eRawFile();
-	ePtr<iDataSource> source = f;
+	ePtr<iTsSource> source = f;
 
 	if (f->open(file) < 0)
 	{
@@ -1764,7 +1764,7 @@ RESULT eDVBChannel::playFile(const char *file)
 	return playSource(source, file);
 }
 
-RESULT eDVBChannel::playSource(ePtr<iDataSource> &source, const char *streaminfo_file)
+RESULT eDVBChannel::playSource(ePtr<iTsSource> &source, const char *streaminfo_file)
 {
 	ASSERT(!m_frontend);
 	if (m_pvr_thread)
@@ -1826,7 +1826,7 @@ void eDVBChannel::stopSource()
 	}
 	if (m_pvr_fd_dst >= 0)
 		::close(m_pvr_fd_dst);
-	ePtr<iDataSource> d;
+	ePtr<iTsSource> d;
 	m_tstools.setSource(d);
 }
 
diff --git a/lib/dvb/dvb.h b/lib/dvb/dvb.h
index 92771604..f612affb 100644
--- a/lib/dvb/dvb.h
+++ b/lib/dvb/dvb.h
@@ -260,7 +260,7 @@ public:
 	RESULT playFile(const char *file);
 	void stopFile();
 
-	RESULT playSource(ePtr<iDataSource>& source, const char *priv=NULL);
+	RESULT playSource(ePtr<iTsSource>& source, const char *priv=NULL);
 	void stopSource();
 
 	void setCueSheet(eCueSheet *cuesheet);
diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h
index 3996b6b6..f15cd04e 100644
--- a/lib/dvb/idvb.h
+++ b/lib/dvb/idvb.h
@@ -15,7 +15,7 @@
 #include <lib/base/object.h>
 #include <lib/base/ebase.h>
 #include <lib/base/elock.h>
-#include <lib/base/idatasource.h>
+#include <lib/base/itssource.h>
 #include <lib/service/service.h>
 #include <libsig_comp.h>
 #include <connection.h>
@@ -607,7 +607,7 @@ public:
 	virtual void stopFile() = 0;
 	
 	/* new interface */
-	virtual RESULT playSource(ePtr<iDataSource> &source, const char *priv=NULL) = 0;
+	virtual RESULT playSource(ePtr<iTsSource> &source, const char *priv=NULL) = 0;
 	virtual void stopSource() = 0;
 	
 	virtual void setCueSheet(eCueSheet *cuesheet) = 0;
diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp
index 0d2f85c4..e54601cf 100644
--- a/lib/dvb/pmt.cpp
+++ b/lib/dvb/pmt.cpp
@@ -691,11 +691,11 @@ void eDVBServicePMTHandler::SDTScanEvent(int event)
 
 int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref, int use_decode_demux, eCueSheet *cue, bool simulate, eDVBService *service)
 {
-	ePtr<iDataSource> s;
+	ePtr<iTsSource> s;
 	return tuneExt(ref, use_decode_demux, s, NULL, cue, simulate, service);
 }
 
-int eDVBServicePMTHandler::tuneExt(eServiceReferenceDVB &ref, int use_decode_demux, ePtr<iDataSource> &source, const char *streaminfo_file, eCueSheet *cue, bool simulate, eDVBService *service)
+int eDVBServicePMTHandler::tuneExt(eServiceReferenceDVB &ref, int use_decode_demux, ePtr<iTsSource> &source, const char *streaminfo_file, eCueSheet *cue, bool simulate, eDVBService *service)
 {
 	RESULT res=0;
 	m_reference = ref;
diff --git a/lib/dvb/pmt.h b/lib/dvb/pmt.h
index 721a8fca..de0de052 100644
--- a/lib/dvb/pmt.h
+++ b/lib/dvb/pmt.h
@@ -209,7 +209,7 @@ public:
 	int tune(eServiceReferenceDVB &ref, int use_decode_demux, eCueSheet *sg=0, bool simulate=false, eDVBService *service = 0);
 
 	/* new interface */
-	int tuneExt(eServiceReferenceDVB &ref, int use_decode_demux, ePtr<iDataSource> &, const char *streaminfo_file, eCueSheet *sg=0, bool simulate=false, eDVBService *service = 0);
+	int tuneExt(eServiceReferenceDVB &ref, int use_decode_demux, ePtr<iTsSource> &, const char *streaminfo_file, eCueSheet *sg=0, bool simulate=false, eDVBService *service = 0);
 
 	void free();
 private:
diff --git a/lib/dvb/tstools.cpp b/lib/dvb/tstools.cpp
index bd363089..cfea3fdd 100644
--- a/lib/dvb/tstools.cpp
+++ b/lib/dvb/tstools.cpp
@@ -35,7 +35,7 @@ eDVBTSTools::~eDVBTSTools()
 int eDVBTSTools::openFile(const char *filename, int nostreaminfo)
 {
 	eRawFile *f = new eRawFile();
-	ePtr<iDataSource> src = f;
+	ePtr<iTsSource> src = f;
 
 	if (f->open(filename, 1) < 0)
 		return -1;
@@ -45,7 +45,7 @@ int eDVBTSTools::openFile(const char *filename, int nostreaminfo)
 	return 0;
 }
 
-void eDVBTSTools::setSource(ePtr<iDataSource> &source, const char *stream_info_filename)
+void eDVBTSTools::setSource(ePtr<iTsSource> &source, const char *stream_info_filename)
 {
 	closeFile();
 
diff --git a/lib/dvb/tstools.h b/lib/dvb/tstools.h
index 1192cd2d..99827921 100644
--- a/lib/dvb/tstools.h
+++ b/lib/dvb/tstools.h
@@ -19,7 +19,7 @@ public:
 	eDVBTSTools();
 	~eDVBTSTools();
 
-	void setSource(ePtr<iDataSource> &source, const char *streaminfo_filename=NULL);
+	void setSource(ePtr<iTsSource> &source, const char *streaminfo_filename=NULL);
 	void closeSource();
 
 	int openFile(const char *filename, int nostreaminfo = 0);
@@ -80,7 +80,7 @@ private:
 	int m_pid;
 	int m_maxrange;
 
-	ePtr<iDataSource> m_source;
+	ePtr<iTsSource> m_source;
 
 	int m_begin_valid, m_end_valid;
 	pts_t m_pts_begin, m_pts_end;