X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/089df6a2a17ec560a9c525857b4bbe43442b5ca8..91eaa14c3fa4ca9596b91d1754976108f3882717:/lib/service/servicedvb.cpp diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp index 9cba0aaf..15deff62 100644 --- a/lib/service/servicedvb.cpp +++ b/lib/service/servicedvb.cpp @@ -1037,29 +1037,8 @@ RESULT eDVBServicePlay::getSubservice(eServiceReference &sub, unsigned int n) ePtr evt; if (!m_event_handler.getEvent(evt, 0)) { - if (!evt->getLinkageService(sub, n)) - { - eServiceReferenceDVB &subservice = (eServiceReferenceDVB&) sub; - eServiceReferenceDVB ¤t = (eServiceReferenceDVB&) m_reference; - subservice.setDVBNamespace(current.getDVBNamespace()); - if ( current.getParentTransportStreamID().get() ) - { - subservice.setParentTransportStreamID( current.getParentTransportStreamID() ); - subservice.setParentServiceID( current.getParentServiceID() ); - } - else - { - subservice.setParentTransportStreamID( current.getTransportStreamID() ); - subservice.setParentServiceID( current.getServiceID() ); - } - if ( subservice.getParentTransportStreamID() == subservice.getTransportStreamID() && - subservice.getParentServiceID() == subservice.getServiceID() ) - { - subservice.setParentTransportStreamID( eTransportStreamID(0) ); - subservice.setParentServiceID( eServiceID(0) ); - } + if (!evt->getLinkageService(sub, m_reference, n)) return 0; - } } sub.type=eServiceReference::idInvalid; return -1;