use setTarget instead of ugly 's'

diff --git a/lib/service/iservice.h b/lib/service/iservice.h
index 822910f..7ea8c17 100644 (file)
--- 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 2494efc..6f52c12 100644 (file)
--- 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 42896bf..d79e620 100644 (file)
--- 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);