From: ghost Date: Wed, 24 Nov 2010 15:07:23 +0000 (+0100) Subject: follow iDataSource -> iTsSource name change X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=96ecbe2e2c2bcd048d1158b3d093732198475b07 follow iDataSource -> iTsSource name change --- diff --git a/lib/service/servicem2ts.cpp b/lib/service/servicem2ts.cpp index a86642c..67bc08c 100644 --- a/lib/service/servicem2ts.cpp +++ b/lib/service/servicem2ts.cpp @@ -5,7 +5,7 @@ DEFINE_REF(eServiceFactoryM2TS) -class eM2TSFile: public iDataSource +class eM2TSFile: public iTsSource { DECLARE_REF(eM2TSFile); eSingleLock m_lock; @@ -13,7 +13,7 @@ public: eM2TSFile(const char *filename, bool cached=false); ~eM2TSFile(); - // iDataSource + // iTsSource off_t lseek(off_t offset, int whence); ssize_t read(off_t offset, void *buf, size_t count); off_t length(); @@ -75,7 +75,7 @@ int eStaticServiceM2TSInformation::getLength(const eServiceReference &ref) stat(ref.path.c_str(), &s); eM2TSFile *file = new eM2TSFile(ref.path.c_str()); - ePtr source = file; + ePtr source = file; if (!source->valid()) return 0; @@ -330,9 +330,9 @@ eServiceM2TS::eServiceM2TS(const eServiceReference &ref) { } -ePtr eServiceM2TS::createDataSource(eServiceReferenceDVB &ref) +ePtr eServiceM2TS::createTsSource(eServiceReferenceDVB &ref) { - ePtr source = new eM2TSFile(ref.path.c_str()); + ePtr source = new eM2TSFile(ref.path.c_str()); return source; } diff --git a/lib/service/servicem2ts.h b/lib/service/servicem2ts.h index a53f731..bfa4f7d 100644 --- a/lib/service/servicem2ts.h +++ b/lib/service/servicem2ts.h @@ -24,7 +24,7 @@ class eServiceM2TS: public eDVBServicePlay friend class eServiceFactoryM2TS; protected: eServiceM2TS(const eServiceReference &ref); - ePtr createDataSource(eServiceReferenceDVB &ref); + ePtr createTsSource(eServiceReferenceDVB &ref); // iSeekableService RESULT isCurrentlySeekable();