diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2010-11-24 16:06:57 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2010-11-24 16:10:56 +0100 |
| commit | 453fc1c6f82fa3b6ae983059eb55ad822860a5eb (patch) | |
| tree | fd8eb3b76c68676195be061977344c9a0011ab55 /lib/base | |
| parent | 7199d3c37e7e7065bd6943702b5864fa5186b9a8 (diff) | |
| download | enigma2-453fc1c6f82fa3b6ae983059eb55ad822860a5eb.tar.gz enigma2-453fc1c6f82fa3b6ae983059eb55ad822860a5eb.zip | |
rename iDataSource to iTsSource (no functional change)
Diffstat (limited to 'lib/base')
| -rw-r--r-- | lib/base/filepush.cpp | 6 | ||||
| -rw-r--r-- | lib/base/filepush.h | 4 | ||||
| -rw-r--r-- | lib/base/itssource.h (renamed from lib/base/idatasource.h) | 2 | ||||
| -rw-r--r-- | lib/base/rawfile.h | 6 |
4 files changed, 9 insertions, 9 deletions
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/itssource.h index 0daa5267..91167ff5 100644 --- a/lib/base/idatasource.h +++ b/lib/base/itssource.h @@ -3,7 +3,7 @@ #include <lib/base/object.h> -class iDataSource: public iObject +class iTsSource: public iObject { public: /* NOTE: should only be used to get current position or filelength */ 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(); |
