disable some debug output
authorFelix Domke <tmbinc@elitedvb.net>
Wed, 9 Nov 2005 15:47:49 +0000 (15:47 +0000)
committerFelix Domke <tmbinc@elitedvb.net>
Wed, 9 Nov 2005 15:47:49 +0000 (15:47 +0000)
Navigation.py
RecordTimer.py
lib/python/Components/ServiceName.py
lib/python/Screens/ChannelSelection.py
lib/service/servicedvb.cpp
mytest.py
skin.py

index b71c93c..6934f11 100644 (file)
@@ -12,14 +12,10 @@ class Navigation:
                
                NavigationInstance.instance = self
                self.ServiceHandler = eServiceCenter.getInstance()
                
                NavigationInstance.instance = self
                self.ServiceHandler = eServiceCenter.getInstance()
-               print self.ServiceHandler
 
                import Navigation as Nav
                Nav.navcore = self
                
 
                import Navigation as Nav
                Nav.navcore = self
                
-               print "Navcore instance set!"
-               print Nav.navcore
-               
                self.pnav = pNavigation()
                self.pnav.m_event.get().append(self.callEvent)
                self.event = [ ]
                self.pnav = pNavigation()
                self.pnav.m_event.get().append(self.callEvent)
                self.event = [ ]
@@ -51,7 +47,6 @@ class Navigation:
                        print "record returned non-zero"
                        return None
                else:
                        print "record returned non-zero"
                        return None
                else:
-                       print "ok, recordService didn't fail"
                        return service
        
        def enqueueService(self, ref):
                        return service
        
        def enqueueService(self, ref):
index 58bf676..cf49df2 100644 (file)
@@ -38,9 +38,9 @@ class RecordTimerEntry(timer.TimerEntry):
                else:
                        description = ""
                
                else:
                        description = ""
                
-               print begin_date
-               print service_name
-               print description
+               print "begin_date: " + str(begin_date)
+               print "service_name: " + str(service_name)
+               print "description: " + str(description)
                self.Filename = Directories.getRecordingFilename(service_name)
                #begin_date + " - " + service_name + description)
                
                self.Filename = Directories.getRecordingFilename(service_name)
                #begin_date + " - " + service_name + description)
                
index c6dcbb7..2e794d6 100644 (file)
@@ -14,8 +14,6 @@ class ServiceName(PerServiceDisplay):
        def newService(self):
                service = self.navcore.getCurrentService()
                
        def newService(self):
                service = self.navcore.getCurrentService()
                
-               print service
-               
                if service is not None:
                        info = service.info()
                        if info is not None:
                if service is not None:
                        info = service.info()
                        if info is not None:
index 43b4cd9..1fe572e 100644 (file)
@@ -69,7 +69,6 @@ class ChannelSelection(Screen):
                class ChannelActionMap(ActionMap):
                        def action(self, contexts, action):
                                if action[:7] == "bouquet":
                class ChannelActionMap(ActionMap):
                        def action(self, contexts, action):
                                if action[:7] == "bouquet":
-                                       print "setting root to " + action[8:]
                                        l = self.csel["list"]
                                        l.setMode(l.MODE_NORMAL)
                                        l.setRoot(eServiceReference("1:0:1:0:0:0:0:0:0:0:" + action[8:]))
                                        l = self.csel["list"]
                                        l.setMode(l.MODE_NORMAL)
                                        l.setRoot(eServiceReference("1:0:1:0:0:0:0:0:0:0:" + action[8:]))
@@ -97,7 +96,6 @@ class ChannelSelection(Screen):
                
                l = self["list"]
                for x in marked:
                
                l = self["list"]
                for x in marked:
-                       print "mark: " + str(x)
                        l.addMarked(x)
                
        def endMarkedEdit(self, abort):
                        l.addMarked(x)
                
        def endMarkedEdit(self, abort):
@@ -136,7 +134,6 @@ class ChannelSelection(Screen):
                        l.setRoot(ref)
                else:
                        self.session.nav.playService(ref)
                        l.setRoot(ref)
                else:
                        self.session.nav.playService(ref)
-                       print "current: " + ref.toString()
                        self.close()
 
        #called from infoBar
                        self.close()
 
        #called from infoBar
index 51061c3..1779d4d 100644 (file)
@@ -371,12 +371,10 @@ eDVBServicePlay::eDVBServicePlay(const eServiceReference &ref, eDVBService *serv
        
        CONNECT(m_service_handler.serviceEvent, eDVBServicePlay::serviceEvent);
        CONNECT(m_event_handler.m_eit_changed, eDVBServicePlay::gotNewEvent);
        
        CONNECT(m_service_handler.serviceEvent, eDVBServicePlay::serviceEvent);
        CONNECT(m_event_handler.m_eit_changed, eDVBServicePlay::gotNewEvent);
-       eDebug("DVB start (play)");
 }
 
 eDVBServicePlay::~eDVBServicePlay()
 {
 }
 
 eDVBServicePlay::~eDVBServicePlay()
 {
-       eDebug("DVB stop (play)");
 }
 
 void eDVBServicePlay::gotNewEvent()
 }
 
 void eDVBServicePlay::gotNewEvent()
@@ -397,7 +395,6 @@ void eDVBServicePlay::gotNewEvent()
 
 void eDVBServicePlay::serviceEvent(int event)
 {
 
 void eDVBServicePlay::serviceEvent(int event)
 {
-       eDebug("service event %d", event);
        switch (event)
        {
        case eDVBServicePMTHandler::eventTuned:
        switch (event)
        {
        case eDVBServicePMTHandler::eventTuned:
@@ -407,8 +404,7 @@ void eDVBServicePlay::serviceEvent(int event)
                {
 //                     eventStartedEventAcquisition
                        m_event_handler.start(m_demux, ((eServiceReferenceDVB&)m_reference).getServiceID().get());
                {
 //                     eventStartedEventAcquisition
                        m_event_handler.start(m_demux, ((eServiceReferenceDVB&)m_reference).getServiceID().get());
-               } else
-                       eDebug("no event data available :( ");
+               }
 //                     eventNoEvent
                break;
        }
 //                     eventNoEvent
                break;
        }
index 5906898..9e99718 100644 (file)
--- a/mytest.py
+++ b/mytest.py
@@ -68,7 +68,6 @@ class Session:
                if self.currentDialog.isTmp:
                        self.currentDialog.doClose()
                
                if self.currentDialog.isTmp:
                        self.currentDialog.doClose()
                
-                       print sys.getrefcount(self.currentDialog)
                        del self.currentDialog.instance
 #                      dump(self.currentDialog)
                        del self.currentDialog
                        del self.currentDialog.instance
 #                      dump(self.currentDialog)
                        del self.currentDialog
diff --git a/skin.py b/skin.py
index 9d4b757..fa5f6fb 100644 (file)
--- a/skin.py
+++ b/skin.py
@@ -236,5 +236,4 @@ def readSkin(screen, skin, name, desktop):
                
                # applyAttributes(guiObject, widget, desktop)
                # guiObject.thisown = 0
                
                # applyAttributes(guiObject, widget, desktop)
                # guiObject.thisown = 0
-               print screen.additionalWidgets
                screen.additionalWidgets.append(w)
                screen.additionalWidgets.append(w)