diff options
| author | Felix Domke <tmbinc@elitedvb.net> | 2006-04-08 15:28:20 +0000 |
|---|---|---|
| committer | Felix Domke <tmbinc@elitedvb.net> | 2006-04-08 15:28:20 +0000 |
| commit | ee5fce8acad063a63f8b97e7eb2ad3aa19359325 (patch) | |
| tree | a82a3a58c8adfbd957e9f11383097a2fe7b7780a /lib | |
| parent | ca60dbd724252e6ac5c3ffe8aaef07b08c0dc0bb (diff) | |
| download | enigma2-ee5fce8acad063a63f8b97e7eb2ad3aa19359325.tar.gz enigma2-ee5fce8acad063a63f8b97e7eb2ad3aa19359325.zip | |
use setTarget instead of ugly 's'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/service/iservice.h | 2 | ||||
| -rw-r--r-- | lib/service/servicedvb.cpp | 13 | ||||
| -rw-r--r-- | lib/service/servicedvb.h | 2 |
3 files changed, 10 insertions, 7 deletions
diff --git a/lib/service/iservice.h b/lib/service/iservice.h index 822910f9..7ea8c17b 100644 --- a/lib/service/iservice.h +++ b/lib/service/iservice.h @@ -437,6 +437,8 @@ public: virtual RESULT connectEvent(const Slot2<void,iPlayableService*,int> &event, ePtr<eConnection> &connection)=0; virtual RESULT start()=0; virtual RESULT stop()=0; + /* might have to be changed... */ + virtual RESULT setTarget(int target)=0; virtual SWIG_VOID(RESULT) seek(ePtr<iSeekableService> &SWIG_OUTPUT)=0; virtual SWIG_VOID(RESULT) pause(ePtr<iPauseableService> &SWIG_OUTPUT)=0; virtual SWIG_VOID(RESULT) info(ePtr<iServiceInformation> &SWIG_OUTPUT)=0; diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp index 2494efc5..6f52c129 100644 --- a/lib/service/servicedvb.cpp +++ b/lib/service/servicedvb.cpp @@ -569,13 +569,6 @@ eDVBServicePlay::eDVBServicePlay(const eServiceReference &ref, eDVBService *serv m_reference(ref), m_dvb_service(service), m_is_paused(0) { m_is_primary = 1; - /* HACK!!! */ - if (m_reference.path == "s") - { - m_reference.path = ""; - m_is_primary = 0; - } - m_is_pvr = !m_reference.path.empty(); m_timeshift_enabled = m_timeshift_active = 0; @@ -735,6 +728,12 @@ RESULT eDVBServicePlay::stop() return 0; } +RESULT eDVBServicePlay::setTarget(int target) +{ + m_is_primary = !target; + return 0; +} + RESULT eDVBServicePlay::connectEvent(const Slot2<void,iPlayableService*,int> &event, ePtr<eConnection> &connection) { connection = new eConnection((iPlayableService*)this, m_event.connect(event)); diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h index 42896bfd..d79e6202 100644 --- a/lib/service/servicedvb.h +++ b/lib/service/servicedvb.h @@ -69,6 +69,8 @@ public: RESULT connectEvent(const Slot2<void,iPlayableService*,int> &event, ePtr<eConnection> &connection); RESULT start(); RESULT stop(); + RESULT setTarget(int target); + RESULT seek(ePtr<iSeekableService> &ptr); RESULT pause(ePtr<iPauseableService> &ptr); RESULT info(ePtr<iServiceInformation> &ptr); |