some changes for new default skin

diff --git a/data/no_coverArt.png b/data/no_coverArt.png
index 4de701138c4f79ed0f28ad796202aab9bd583a3e..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
Binary files a/data/no_coverArt.png and b/data/no_coverArt.png differ

diff --git a/lib/components/scan.cpp b/lib/components/scan.cpp
index 2870388a45738ca940cc33ba260187a069c7b56e..79fe2ef5df858e3174454d3c46a43368304e9091 100644 (file)
--- a/lib/components/scan.cpp
+++ b/lib/components/scan.cpp
@@ -114,6 +114,14 @@ int eComponentScan::start(int feid, int flags)
        return 0;
 }
 
        return 0;
 }
 

+RESULT eComponentScan::getFrontend(ePtr<iDVBFrontend> &fe)
+{
+       if (m_scan)
+               return m_scan->getFrontend(fe);
+       fe = 0;
+       return -1;
+}
+

 int eComponentScan::getProgress()
 {
        if (!m_scan)
 int eComponentScan::getProgress()
 {
        if (!m_scan)

diff --git a/lib/components/scan.h b/lib/components/scan.h
index fb6b921fca81ff9d870301f7b259aeabff2860e5..e4bb41eea04d08688131c5cae5c663475720fc19 100644 (file)
--- a/lib/components/scan.h
+++ b/lib/components/scan.h
@@ -46,7 +46,8 @@ public:
        
                /* please keep the flags in sync with lib/dvb/scan.h ! */
        enum { scanNetworkSearch=1, scanRemoveServices=4, scanDontRemoveFeeds=8, clearToScanOnFirstNIT = 16 };
        
                /* please keep the flags in sync with lib/dvb/scan.h ! */
        enum { scanNetworkSearch=1, scanRemoveServices=4, scanDontRemoveFeeds=8, clearToScanOnFirstNIT = 16 };

-       int start(int feid, int flags=0);
+       int start(int feid, int flags=0 );
+       SWIG_VOID(RESULT) getFrontend(ePtr<iDVBFrontend> &SWIG_OUTPUT);

 };
 
 #endif
 };
 
 #endif

diff --git a/lib/dvb/scan.cpp b/lib/dvb/scan.cpp
index e2bf6215884268a339c73e593d00cb31998f9087..3915a0c4fb05f089d05b3fdfa99443b0cf8ff0ec 100644 (file)
--- a/lib/dvb/scan.cpp
+++ b/lib/dvb/scan.cpp
@@ -775,3 +775,11 @@ void eDVBScan::getLastServiceName(std::string &last_service_name)
        else
                last_service_name = m_last_service->second->m_service_name;
 }
        else
                last_service_name = m_last_service->second->m_service_name;
 }

+
+RESULT eDVBScan::getFrontend(ePtr<iDVBFrontend> &fe)
+{
+       if (m_channel)
+               return m_channel->getFrontend(fe);
+       fe = 0;
+       return -1;
+}
\ No newline at end of file

diff --git a/lib/dvb/scan.h b/lib/dvb/scan.h
index 96a1528d735a94dae4bddf1d8afbaf454bbd60f9..ab7f3b5da141ed6bb9c6b6ff07c6c70f2c4db2a5 100644 (file)
--- a/lib/dvb/scan.h
+++ b/lib/dvb/scan.h
@@ -86,6 +86,7 @@ public:
        
        void getStats(int &transponders_done, int &transponders_total, int &services);
        void getLastServiceName(std::string &name);
        
        void getStats(int &transponders_done, int &transponders_total, int &services);
        void getLastServiceName(std::string &name);

+       RESULT getFrontend(ePtr<iDVBFrontend> &);

 };
 
 #endif
 };
 
 #endif

diff --git a/lib/python/Components/ServiceScan.py b/lib/python/Components/ServiceScan.py
index 09498713ff0c8e9e403328f2be187b5098806abc..26ce763be746c181b61f87c46b6cedbbdd294124 100644 (file)
--- a/lib/python/Components/ServiceScan.py
+++ b/lib/python/Components/ServiceScan.py
@@ -46,18 +46,19 @@ class ServiceScan:
                                self.run += 1
                                self.execBegin()
        
                                self.run += 1
                                self.execBegin()
        

-       def __init__(self, progressbar, text, servicelist, passNumber, scanList):
+       def __init__(self, progressbar, text, servicelist, passNumber, scanList, frontendInfo):

                self.foundServices = 0
                self.progressbar = progressbar
                self.text = text
                self.servicelist = servicelist
                self.passNumber = passNumber
                self.scanList = scanList
                self.foundServices = 0
                self.progressbar = progressbar
                self.text = text
                self.servicelist = servicelist
                self.passNumber = passNumber
                self.scanList = scanList

+               self.frontendInfo = frontendInfo

                self.run = 0
                self.run = 0

-               
+

        def doRun(self):
                self.scan = eComponentScan()
        def doRun(self):
                self.scan = eComponentScan()

-               
+               self.frontendInfo.frontend_source = lambda : self.scan.getFrontend()

                self.feid = self.scanList[self.run]["feid"]
                self.flags = self.scanList[self.run]["flags"]
                self.state = self.Idle
                self.feid = self.scanList[self.run]["feid"]
                self.flags = self.scanList[self.run]["flags"]
                self.state = self.Idle


@@ -79,10 +80,10 @@ class ServiceScan:
                self.servicelist.clear()
                self.state = self.Running
                err = self.scan.start(self.feid, self.flags)
                self.servicelist.clear()
                self.state = self.Running
                err = self.scan.start(self.feid, self.flags)

+               self.frontendInfo.updateFrontendData()

                if err:
                        self.state = self.Error
                        self.errorcode = 0
                if err:
                        self.state = self.Error
                        self.errorcode = 0

-

                self.scanStatusChanged()
        
        def execEnd(self):
                self.scanStatusChanged()
        
        def execEnd(self):

diff --git a/lib/python/Components/Sources/FrontendStatus.py b/lib/python/Components/Sources/FrontendStatus.py
index e1623ae1479d9609f276f5cf29c318a0ded2ea74..5e0961867ee44bb63b41cad998d0d7804b9a1afb 100644 (file)
--- a/lib/python/Components/Sources/FrontendStatus.py
+++ b/lib/python/Components/Sources/FrontendStatus.py
@@ -29,11 +29,11 @@ class FrontendStatus(Source):
 
        def getFrontendStatus(self):
                if self.frontend_source:
 
        def getFrontendStatus(self):
                if self.frontend_source:

-                       frontend = self.frontend_source
+                       frontend = self.frontend_source()
+                       dict = { }

                        if frontend:
                        if frontend:

-                               dict = { }

                                frontend.getFrontendStatus(dict)
                                frontend.getFrontendStatus(dict)

-                               return dict
+                       return dict

                elif self.service_source:
                        service = self.service_source()
                        feinfo = service and service.frontendInfo()
                elif self.service_source:
                        service = self.service_source()
                        feinfo = service and service.frontendInfo()

diff --git a/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py b/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py
index 6d177e4c024e79d0c6206758a74853c2cbc35d87..3c86734a1ffd637ebd0773c8f27bde630917107c 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py
@@ -113,7 +113,7 @@ class Satfinder(ScanSetup):
                ScanSetup.__init__(self, session)
                self.tuner = Tuner(self.frontend)
                self["introduction"].setText("")
                ScanSetup.__init__(self, session)
                self.tuner = Tuner(self.frontend)
                self["introduction"].setText("")

-               self["Frontend"] = FrontendStatus(frontend_source = self.frontend, update_interval = 100)
+               self["Frontend"] = FrontendStatus(frontend_source = lambda : self.frontend, update_interval = 100)

                self.initcomplete = True
 
        def createSetup(self):
                self.initcomplete = True
 
        def createSetup(self):

diff --git a/lib/python/Screens/ServiceScan.py b/lib/python/Screens/ServiceScan.py
index 772141a6540ce9bcde513875e4a1b5283de5a752..a529e71c283f423bf11f8f2f23b991482073b54e 100644 (file)
--- a/lib/python/Screens/ServiceScan.py
+++ b/lib/python/Screens/ServiceScan.py
@@ -4,6 +4,7 @@ from Components.ProgressBar import ProgressBar
 from Components.Label import Label
 from Components.ActionMap import ActionMap
 from Components.FIFOList import FIFOList
 from Components.Label import Label
 from Components.ActionMap import ActionMap
 from Components.FIFOList import FIFOList

+from Components.Sources.FrontendInfo import FrontendInfo

 
 class ServiceScan(Screen):
        def ok(self):
 
 class ServiceScan(Screen):
        def ok(self):


@@ -23,7 +24,8 @@ class ServiceScan(Screen):
                self["scan_state"] = Label(_("scan state"))
                self["pass"] = Label("")
                self["servicelist"] = FIFOList(len=7)
                self["scan_state"] = Label(_("scan state"))
                self["pass"] = Label("")
                self["servicelist"] = FIFOList(len=7)

-               self["scan"] = CScan(self["scan_progress"], self["scan_state"], self["servicelist"], self["pass"], scanList)
+               self["FrontendInfo"] = FrontendInfo()
+               self["scan"] = CScan(self["scan_progress"], self["scan_state"], self["servicelist"], self["pass"], scanList, self["FrontendInfo"])

 
                self["actions"] = ActionMap(["OkCancelActions"], 
                        {
 
                self["actions"] = ActionMap(["OkCancelActions"], 
                        {

diff --git a/lib/python/enigma_python.i b/lib/python/enigma_python.i
index cef97c36e0a86619f8a0b034c9c63037750b713b..01a73108be620b9d00e6b0e1aafcc7156341087c 100644 (file)
--- a/lib/python/enigma_python.i
+++ b/lib/python/enigma_python.i
@@ -86,6 +86,8 @@ is usually caused by not marking PSignals as immutable.
 #include <lib/dvb/frontendparms.h>
 #include <lib/dvb/dvbtime.h>
 #include <lib/dvb/pmt.h>
 #include <lib/dvb/frontendparms.h>
 #include <lib/dvb/dvbtime.h>
 #include <lib/dvb/pmt.h>

+#include <lib/components/scan.h>
+#include <lib/components/file_eraser.h>

 #include <lib/driver/avswitch.h>
 #include <lib/driver/rfmod.h>
 #include <lib/driver/misc_options.h>
 #include <lib/driver/avswitch.h>
 #include <lib/driver/rfmod.h>
 #include <lib/driver/misc_options.h>


@@ -185,8 +187,6 @@ typedef long time_t;
 %include <lib/gui/ewidgetanimation.h>
 %include <lib/gui/evideo.h>
 %include <lib/service/listboxservice.h>
 %include <lib/gui/ewidgetanimation.h>
 %include <lib/gui/evideo.h>
 %include <lib/service/listboxservice.h>

-%include <lib/components/scan.h>
-%include <lib/components/file_eraser.h>

 %include <lib/nav/pcore.h>
 %include <lib/actions/action.h>
 %include <lib/gdi/gfont.h>
 %include <lib/nav/pcore.h>
 %include <lib/actions/action.h>
 %include <lib/gdi/gfont.h>


@@ -200,6 +200,8 @@ typedef long time_t;
 %include <lib/dvb/dvb.h>
 %include <lib/dvb/frontend.h>
 %include <lib/dvb/pmt.h>
 %include <lib/dvb/dvb.h>
 %include <lib/dvb/frontend.h>
 %include <lib/dvb/pmt.h>

+%include <lib/components/scan.h>
+%include <lib/components/file_eraser.h>

 %include <lib/driver/avswitch.h>
 %include <lib/driver/rfmod.h>
 %include <lib/driver/misc_options.h>
 %include <lib/driver/avswitch.h>
 %include <lib/driver/rfmod.h>
 %include <lib/driver/misc_options.h>