From 453fc1c6f82fa3b6ae983059eb55ad822860a5eb Mon Sep 17 00:00:00 2001
From: ghost <andreas.monzner@multimedia-labs.de>
Date: Wed, 24 Nov 2010 16:06:57 +0100
Subject: rename iDataSource to iTsSource (no functional change)

---
 lib/base/filepush.cpp  |  6 +++---
 lib/base/filepush.h    |  4 ++--
 lib/base/idatasource.h | 19 -------------------
 lib/base/itssource.h   | 19 +++++++++++++++++++
 lib/base/rawfile.h     |  6 +++---
 5 files changed, 27 insertions(+), 27 deletions(-)
 delete mode 100644 lib/base/idatasource.h
 create mode 100644 lib/base/itssource.h

(limited to 'lib/base')

diff --git a/lib/base/filepush.cpp b/lib/base/filepush.cpp
index af5a8bb6..e3e2a13a 100644
--- a/lib/base/filepush.cpp
+++ b/lib/base/filepush.cpp
@@ -227,7 +227,7 @@ void eFilePushThread::thread()
 void eFilePushThread::start(int fd, int fd_dest)
 {
 	eRawFile *f = new eRawFile();
-	ePtr<iDataSource> source = f;
+	ePtr<iTsSource> source = f;
 	f->setfd(fd);
 	start(source, fd_dest);
 }
@@ -235,14 +235,14 @@ void eFilePushThread::start(int fd, int fd_dest)
 int eFilePushThread::start(const char *file, int fd_dest)
 {
 	eRawFile *f = new eRawFile();
-	ePtr<iDataSource> source = f;
+	ePtr<iTsSource> source = f;
 	if (f->open(file) < 0)
 		return -1;
 	start(source, fd_dest);
 	return 0;
 }
 
-void eFilePushThread::start(ePtr<iDataSource> &source, int fd_dest)
+void eFilePushThread::start(ePtr<iTsSource> &source, int fd_dest)
 {
 	m_source = source;
 	m_fd_dest = fd_dest;
diff --git a/lib/base/filepush.h b/lib/base/filepush.h
index eb8e7924..a4457f67 100644
--- a/lib/base/filepush.h
+++ b/lib/base/filepush.h
@@ -25,7 +25,7 @@ public:
 	void start(int sourcefd, int destfd);
 	int start(const char *filename, int destfd);
 
-	void start(ePtr<iDataSource> &source, int destfd);
+	void start(ePtr<iTsSource> &source, int destfd);
 
 	void pause();
 	void resume();
@@ -60,7 +60,7 @@ private:
 	int m_blocksize;
 	off_t m_current_position;
 
-	ePtr<iDataSource> m_source;
+	ePtr<iTsSource> m_source;
 
 	eFixedMessagePump<int> m_messagepump;
 
diff --git a/lib/base/idatasource.h b/lib/base/idatasource.h
deleted file mode 100644
index 0daa5267..00000000
--- a/lib/base/idatasource.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef __lib_base_idatasource_h
-#define __lib_base_idatasource_h
-
-#include <lib/base/object.h>
-
-class iDataSource: public iObject
-{
-public:
-	 /* NOTE: should only be used to get current position or filelength */
-	virtual off_t lseek(off_t offset, int whence)=0;
-	
-	/* NOTE: you must be able to handle short reads! */
-	virtual ssize_t read(off_t offset, void *buf, size_t count)=0; /* NOTE: this is what you in normal case have to use!! */
-
-	virtual off_t length()=0;
-	virtual int valid()=0;
-};
-
-#endif
diff --git a/lib/base/itssource.h b/lib/base/itssource.h
new file mode 100644
index 00000000..91167ff5
--- /dev/null
+++ b/lib/base/itssource.h
@@ -0,0 +1,19 @@
+#ifndef __lib_base_idatasource_h
+#define __lib_base_idatasource_h
+
+#include <lib/base/object.h>
+
+class iTsSource: public iObject
+{
+public:
+	 /* NOTE: should only be used to get current position or filelength */
+	virtual off_t lseek(off_t offset, int whence)=0;
+	
+	/* NOTE: you must be able to handle short reads! */
+	virtual ssize_t read(off_t offset, void *buf, size_t count)=0; /* NOTE: this is what you in normal case have to use!! */
+
+	virtual off_t length()=0;
+	virtual int valid()=0;
+};
+
+#endif
diff --git a/lib/base/rawfile.h b/lib/base/rawfile.h
index 1720d581..7b736a33 100644
--- a/lib/base/rawfile.h
+++ b/lib/base/rawfile.h
@@ -2,9 +2,9 @@
 #define __lib_base_rawfile_h
 
 #include <string>
-#include <lib/base/idatasource.h>
+#include <lib/base/itssource.h>
 
-class eRawFile: public iDataSource
+class eRawFile: public iTsSource
 {
 	DECLARE_REF(eRawFile);
 	eSingleLock m_lock;
@@ -15,7 +15,7 @@ public:
 	void setfd(int fd);
 	int close();
 
-	// iDataSource
+	// iTsSource
 	off_t lseek(off_t offset, int whence);
 	ssize_t read(off_t offset, void *buf, size_t count);
 	off_t length();
-- 
cgit v1.2.3