fix marking non playable services in channellist

diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp
index 38a062a2a5cd1dc562462996bc575e2c911c1193..658c5866e1ac2dab888b7bca8beba5547737e477 100644 (file)
--- a/lib/dvb/db.cpp
+++ b/lib/dvb/db.cpp
@@ -1,5 +1,6 @@
 #include <errno.h>
 #include <lib/dvb/db.h>
+#include <lib/dvb/dvb.h>
 #include <lib/dvb/frontend.h>
 #include <lib/dvb/epgcache.h>
 #include <lib/base/eerror.h>
@@ -154,6 +155,21 @@ RESULT eDVBService::getEvent(const eServiceReference &ref, ePtr<eServiceEvent> &
        return eEPGCache::getInstance()->lookupEventTime(ref, t, ptr);
 }
 
+bool eDVBService::isPlayable(const eServiceReference &ref, const eServiceReference &ignore)
+{
+       ePtr<eDVBResourceManager> res_mgr;
+       if ( eDVBResourceManager::getInstance( res_mgr ) )
+               eDebug("isPlayble... no res manager!!");
+       else
+       {
+               eDVBChannelID chid, chid_ignore;
+               ((const eServiceReferenceDVB&)ref).getChannelID(chid);
+               ((const eServiceReferenceDVB&)ignore).getChannelID(chid_ignore);
+               return res_mgr->canAllocateChannel(chid, chid_ignore);
+       }
+       return false;
+}
+
 int eDVBService::checkFilter(const eServiceReferenceDVB &ref, const eDVBChannelQuery &query)
 {
        int res = 0;

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index 4107c22dc89e65fcfd5f82e2850df56f1a4d16ec..aa7958126f2a707e3ccbe4279ee7b45f40de4306 100644 (file)
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -406,14 +406,13 @@ RESULT eDVBResourceManager::connectChannelAdded(const Slot1<void,eDVBChannel*> &
        return 0;
 }
 
-bool eDVBResourceManager::canAllocateFrontend(ePtr<iDVBFrontendParameters> &feparm, int used_tuner_mask)
+bool eDVBResourceManager::canAllocateFrontend(ePtr<iDVBFrontendParameters> &feparm)
 {
-       eDebug("canAllocateFrontend mask %08x", used_tuner_mask);
        ePtr<eDVBRegisteredFrontend> best;
        int bestval = 0;
 
        for (eSmartPtrList<eDVBRegisteredFrontend>::iterator i(m_frontend.begin()); i != m_frontend.end(); ++i)
-               if ( !(used_tuner_mask & (1<<i->m_frontend->getID())) )
+               if (!i->m_inuse)
                {
                        int c = i->m_frontend->isCompatibleWith(feparm);
                        if (c > bestval)
@@ -423,16 +422,11 @@ bool eDVBResourceManager::canAllocateFrontend(ePtr<iDVBFrontendParameters> &fepa
        return bestval>0;
 }
 
-bool eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid)
+bool eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid, const eDVBChannelID& ignore)
 {
-       return true;
-#if 0
-       int used_tuner_mask=0;
-
                /* first, check if a channel is already existing. */
 //     eDebug("allocate channel.. %04x:%04x", channelid.transport_stream_id.get(), channelid.original_network_id.get());
-       int cnt=0;
-       for (std::list<active_channel>::iterator i(m_active_channels.begin()); i != m_active_channels.end(); ++i, ++cnt)
+       for (std::list<active_channel>::iterator i(m_active_channels.begin()); i != m_active_channels.end(); ++i)
        {
 //             eDebug("available channel.. %04x:%04x", i->m_channel_id.transport_stream_id.get(), i->m_channel_id.original_network_id.get());
                if (i->m_channel_id == channelid)
@@ -440,28 +434,33 @@ bool eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid)
 //                     eDebug("found shared channel..");
                        return true;
                }
+       }
+
+       int *decremented_fe_usecount=NULL;
 
-               eDebug("activeChannel %d, NonDecoderDemux %p, DecoderDemux %p",
-                       cnt, i->m_channel->getNonDecoderDemux(), i->m_channel->getDecoderDemux() );
-               if ( i->m_channel->getNonDecoderDemux() )
+       for (std::list<active_channel>::iterator i(m_active_channels.begin()); i != m_active_channels.end(); ++i)
+       {
+//             eDebug("available channel.. %04x:%04x", i->m_channel_id.transport_stream_id.get(), i->m_channel_id.original_network_id.get());
+               if (i->m_channel_id == ignore)
                {
-                       ePtr<iDVBFrontend> fe;
-                       if (!i->m_channel->getFrontend(fe))
+                       eDVBChannel *channel = (eDVBChannel*) &(*i->m_channel);
+                       if (channel->getUseCount() == 1)  // channel only used once..
                        {
-                               if (fe)
+                               ePtr<iDVBFrontend> fe;
+                               if (!i->m_channel->getFrontend(fe))
                                {
                                        for (eSmartPtrList<eDVBRegisteredFrontend>::iterator ii(m_frontend.begin()); ii != m_frontend.end(); ++ii)
                                        {
                                                if ( &(*fe) == &(*ii->m_frontend) )
                                                {
-                                                       used_tuner_mask |= (1 << ii->m_frontend->getID());
+                                                       --ii->m_inuse;
+                                                       decremented_fe_usecount = &ii->m_inuse;
                                                        break;
                                                }
                                        }
                                }
-                               else
-                                       eDebug("fe kaputt");
                        }
+                       break;
                }
        }
 
@@ -478,8 +477,12 @@ bool eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid)
                return false;
        }
 
-       return canAllocateFrontend(feparm, used_tuner_mask);
-#endif
+       bool ret = canAllocateFrontend(feparm);
+
+       if (decremented_fe_usecount)
+               ++(*decremented_fe_usecount);
+
+       return ret;
 }
 
 DEFINE_REF(eDVBChannel);

diff --git a/lib/dvb/dvb.h b/lib/dvb/dvb.h
index 5c3c515035819d37a535b6bf158810ade742ba9d..6a9e6330097923be90a3e72507eef9cb4a102c93 100644 (file)
--- a/lib/dvb/dvb.h
+++ b/lib/dvb/dvb.h
@@ -142,7 +142,7 @@ class eDVBResourceManager: public iObject
        Signal1<void,eDVBChannel*> m_channelRemoved;
        Signal1<void,iDVBChannel*> m_channelRunning;
 
-       bool canAllocateFrontend(ePtr<iDVBFrontendParameters> &feparm, int used_tuner_mask);
+       bool canAllocateFrontend(ePtr<iDVBFrontendParameters> &feparm);
 public:
        eDVBResourceManager();
        virtual ~eDVBResourceManager();
@@ -167,7 +167,7 @@ public:
        RESULT connectChannelRemoved(const Slot1<void,eDVBChannel*> &channelRemoved, ePtr<eConnection> &connection);
        RESULT connectChannelRunning(const Slot1<void,iDVBChannel*> &channelRemoved, ePtr<eConnection> &connection);
 
-       bool canAllocateChannel(const eDVBChannelID &channelid);
+       bool canAllocateChannel(const eDVBChannelID &channelid, const eDVBChannelID &ignore);
 };
 
 class eFilePushThread;
@@ -201,6 +201,7 @@ public:
                           there is an unknown amount of buffers in between */
        RESULT seekToPosition(iDVBDemux *decoding_demux, const off_t &off);
 
+       int getUseCount() { return m_use_count; }
 private:
        ePtr<eDVBAllocatedFrontend> m_frontend;
        ePtr<eDVBAllocatedDemux> m_demux, m_decoder_demux;

diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h
index c7e223970b39532d956a7c9a4cf608d2f0a0facf..a14e0af5a59cf623f44a9f98ffd2ea1a55627085 100644 (file)
--- a/lib/dvb/idvb.h
+++ b/lib/dvb/idvb.h
@@ -219,7 +219,8 @@ public:
        // iStaticServiceInformation
        RESULT getName(const eServiceReference &ref, std::string &name);
        RESULT getEvent(const eServiceReference &ref, ePtr<eServiceEvent> &ptr);
-       
+       bool isPlayable(const eServiceReference &ref, const eServiceReference &ignore);
+
                /* for filtering: */
        int checkFilter(const eServiceReferenceDVB &ref, const eDVBChannelQuery &query);
 };

diff --git a/lib/python/Components/ServiceList.py b/lib/python/Components/ServiceList.py
index 84e9e82e3b33996cf874bc520bb58dd96decc83a..d008c475682ea29a51f79a69c72113b75374d4ee 100644 (file)
--- a/lib/python/Components/ServiceList.py
+++ b/lib/python/Components/ServiceList.py
@@ -70,6 +70,9 @@ class ServiceList(HTMLComponent, GUIComponent):
        def setNumberOffset(self, offset):
                self.l.setNumberOffset(offset)
 
+       def setPlayableIgnoreService(self, ref):
+               self.l.setIgnoreService(ref)
+
        def setRoot(self, root):
                self.root = root
                self.l.setRoot(root)

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index ae344dcce554f215338aec7458f29da372937e74..03182ab82526d358e9eeedd4b711efda87baaa72 100644 (file)
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -364,6 +364,14 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit):
                                "0": self.keyNumberGlobal
                        })
                self["actions"].csel = self
+               self.onShown.append(self.onShow)
+
+       def onShow(self):
+               ref = self.session.nav.getCurrentlyPlayingServiceReference()
+               if ref.valid() and ref.getPath() == "":
+                       self.servicelist.setPlayableIgnoreService(ref)
+               else:
+                       self.servicelist.setPlayableIgnoreService(eServiceReference())
 
        def showEPGList(self):
                ref=self.servicelist.getCurrent()
@@ -430,6 +438,9 @@ class SimpleChannelSelection(ChannelSelectionBase):
                                "cancel": self.cancel,
                                "ok": self.channelSelected,
                                "showFavourites": self.showFavourites,
+                               "showAllServices": self.showAllServices,
+                               "showProviders": self.showProviders,
+                               "showSatellites": self.showSatellites,
                                "1": self.keyNumberGlobal,
                                "2": self.keyNumberGlobal,
                                "3": self.keyNumberGlobal,
@@ -445,6 +456,7 @@ class SimpleChannelSelection(ChannelSelectionBase):
 
        def onExecCallback(self):
                print "onExecCallback"
+               self.showFavourites()
                self.session.currentDialog.instance.setTitle(self.title)
 
        def channelSelected(self): # just return selected service

diff --git a/lib/service/iservice.h b/lib/service/iservice.h
index ab95ef79abe49e58c719f453e4cf68ee82ce3d89..232e66f2872fbae8749d3e7d38abec4dfd291455 100644 (file)
--- a/lib/service/iservice.h
+++ b/lib/service/iservice.h
@@ -175,6 +175,8 @@ public:
                // doesn't need to be implemented, should return -1 then.
        virtual int getLength(const eServiceReference &ref);
        virtual SWIG_VOID(RESULT) getEvent(const eServiceReference &ref, ePtr<eServiceEvent> &SWIG_OUTPUT);
+               // returns true when not implemented
+       virtual bool isPlayable(const eServiceReference &ref, const eServiceReference &ignore);
 };
 
 TEMPLATE_TYPEDEF(ePtr<iStaticServiceInformation>, iStaticServiceInformationPtr);
@@ -264,7 +266,6 @@ public:
 
 TEMPLATE_TYPEDEF(ePtr<iAudioTrackSelection>, iAudioTrackSelectionPtr);
 
-
 class iPlayableService: public iObject
 {
        friend class iServiceHandler;

diff --git a/lib/service/listboxservice.cpp b/lib/service/listboxservice.cpp
index 4e20fcb7f53e70cd4125c036faaf92a59664d180..035658ee1a6d5f3c9543106375b9a5e760a2e471 100644 (file)
--- a/lib/service/listboxservice.cpp
+++ b/lib/service/listboxservice.cpp
@@ -335,28 +335,12 @@ void eListboxServiceContent::paint(gPainter &painter, eWindowStyle &style, const
 {
        painter.clip(eRect(offset, m_itemsize));
 
-       bool tuneable=true;
-
-#if 0
-       if (m_res_mgr && cursorValid() && !((m_cursor->flags & eServiceReference::flagDirectory) == eServiceReference::flagDirectory))
-       {
-               eServiceReferenceDVB &ref = (eServiceReferenceDVB&) *m_cursor;
-               eDVBChannelID chid;
-               ref.getChannelID(chid);
-               tuneable = m_res_mgr->canAllocateChannel(chid);
-       }
-#endif
-
        if (m_current_marked && selected)
                style.setStyle(painter, eWindowStyle::styleListboxMarked);
        else if (cursorValid() && isMarked(*m_cursor))
                style.setStyle(painter, eWindowStyle::styleListboxMarked);
        else
-       {
                style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);
-               if (!tuneable)
-                       painter.setForegroundColor(gRGB(0xbbbbbb));
-       }
        painter.clear();
        
        if (cursorValid())
@@ -364,7 +348,10 @@ void eListboxServiceContent::paint(gPainter &painter, eWindowStyle &style, const
                        /* get service information */
                ePtr<iStaticServiceInformation> service_info;
                m_service_center->info(*m_cursor, service_info);
-               
+
+               if (m_is_playable_ignore.valid() && !service_info->isPlayable(*m_cursor, m_is_playable_ignore))
+                       painter.setForegroundColor(gRGB(0xbbbbbb));
+
                for (int e = 0; e < celElements; ++e)
                {
                        if (!m_element_font[e])
@@ -447,3 +434,7 @@ void eListboxServiceContent::paint(gPainter &painter, eWindowStyle &style, const
        painter.clippop();
 }
 
+void eListboxServiceContent::setIgnoreService( const eServiceReference &service )
+{
+       m_is_playable_ignore=service;
+}

diff --git a/lib/service/listboxservice.h b/lib/service/listboxservice.h
index b1cc249b940bc9d0cc0676ffc494ce3465395d57..a742b061ffde88bfb625fca0e158879a913d3686 100644 (file)
--- a/lib/service/listboxservice.h
+++ b/lib/service/listboxservice.h
@@ -10,6 +10,8 @@ class eListboxServiceContent: public virtual iListboxContent
        DECLARE_REF(eListboxServiceContent);
 public:
        eListboxServiceContent();
+
+       void setIgnoreService( const eServiceReference &service );
        void setRoot(const eServiceReference &ref);
        void getCurrent(eServiceReference &ref);
        
@@ -96,6 +98,8 @@ private:
        bool m_current_marked;
 
        int m_numberoffset;
+
+       eServiceReference m_is_playable_ignore;
 };
 
 #endif

diff --git a/lib/service/service.cpp b/lib/service/service.cpp
index a7f6e529823a68152189cfd85745257d84b86f36..c043a583ededc5bb241a99899558a71e44599b05 100644 (file)
--- a/lib/service/service.cpp
+++ b/lib/service/service.cpp
@@ -144,8 +144,13 @@ int iStaticServiceInformation::getLength(const eServiceReference &ref)
        return -1;
 }
 
+bool iStaticServiceInformation::isPlayable(const eServiceReference &ref, const eServiceReference &ignore)
+{
+       return true;
+}
+
 RESULT iServiceInformation::getEvent(ePtr<eServiceEvent> &evt, int m_nownext)
-{      
+{
        evt = 0;
        return -1;
 }