Revert "add virtual baseclass for data sources (iDataSource)"

[vuplus_dvbapp] / lib / base / rawfile.h

diff --git a/lib/base/rawfile.h b/lib/base/rawfile.h
index bb39dc6..a1c73d6 100644 (file)
--- a/lib/base/rawfile.h
+++ b/lib/base/rawfile.h
@@ -2,58 +2,24 @@
 #define __lib_base_rawfile_h
 
 #include <string>
 #define __lib_base_rawfile_h
 
 #include <string>

-#include <lib/base/object.h>

 
 

-class iDataSource: public iObject
+class eRawFile

 {
 public:
 {
 public:

-       virtual off_t lseek(off_t offset, int whence)=0;
-       virtual ssize_t read(void *buf, size_t count)=0; /* NOTE: you must be able to handle short reads! */
-       virtual off_t length()=0;
-       virtual off_t position()=0;
-       virtual int valid()=0;
-       virtual eSingleLock &getLock()=0;
-       virtual bool is_shared()=0;
-};
-
-class iDataSourcePositionRestorer
-{
-       ePtr<iDataSource> &m_source;
-       off_t m_position;
-public:
-       iDataSourcePositionRestorer(ePtr<iDataSource> &source)
-               :m_source(source)
-       {
-               if (m_source->is_shared())
-                       m_position = m_source->position();
-       }
-       ~iDataSourcePositionRestorer()
-       {
-               if (m_source->is_shared())
-                       m_source->lseek(m_position, SEEK_SET);
-       }
-};
-
-class eRawFile: public iDataSource
-{
-       DECLARE_REF(eRawFile);
-       eSingleLock m_lock;
-public:

        eRawFile();
        ~eRawFile();
        eRawFile();
        ~eRawFile();

+       

        int open(const char *filename, int cached = 0);
        void setfd(int fd);
        off_t lseek(off_t offset, int whence);
        int close();
        ssize_t read(void *buf, size_t count); /* NOTE: you must be able to handle short reads! */
        off_t length();
        int open(const char *filename, int cached = 0);
        void setfd(int fd);
        off_t lseek(off_t offset, int whence);
        int close();
        ssize_t read(void *buf, size_t count); /* NOTE: you must be able to handle short reads! */
        off_t length();

-       off_t position();

        int valid();
        int valid();

-       eSingleLock &getLock();
-       bool is_shared() { return ref.count > 1; }

 private:
        int m_fd;     /* for uncached */
        FILE *m_file; /* for cached */
 private:
        int m_fd;     /* for uncached */
        FILE *m_file; /* for cached */

+       

        int m_cached;
        std::string m_basename;
        off_t m_splitsize, m_totallength, m_current_offset, m_base_offset, m_last_offset;
        int m_cached;
        std::string m_basename;
        off_t m_splitsize, m_totallength, m_current_offset, m_base_offset, m_last_offset;