projects
/
vuplus_dvbapp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove deprecated code (deprecation date was 2008-01 and 2008-02)
[vuplus_dvbapp]
/
lib
/
python
/
Screens
/
ChannelSelection.py
diff --git
a/lib/python/Screens/ChannelSelection.py
b/lib/python/Screens/ChannelSelection.py
index
77991d0
..
755d37f
100644
(file)
--- a/
lib/python/Screens/ChannelSelection.py
+++ b/
lib/python/Screens/ChannelSelection.py
@@
-14,12
+14,10
@@
from Tools.NumericalTextInput import NumericalTextInput
profile("ChannelSelection.py 2")
from Components.NimManager import nimmanager
profile("ChannelSelection.py 2.1")
profile("ChannelSelection.py 2")
from Components.NimManager import nimmanager
profile("ChannelSelection.py 2.1")
-from Components.Sources.Source import ObsoleteSource
-profile("ChannelSelection.py 2.2")
from Components.Sources.RdsDecoder import RdsDecoder
from Components.Sources.RdsDecoder import RdsDecoder
-profile("ChannelSelection.py 2.
3
")
+profile("ChannelSelection.py 2.
2
")
from Components.Sources.ServiceEvent import ServiceEvent
from Components.Sources.ServiceEvent import ServiceEvent
-profile("ChannelSelection.py 2.
4
")
+profile("ChannelSelection.py 2.
3
")
from Components.Input import Input
profile("ChannelSelection.py 3")
from Components.ParentalControl import parentalControl
from Components.Input import Input
profile("ChannelSelection.py 3")
from Components.ParentalControl import parentalControl
@@
-1067,8
+1065,6
@@
class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit, ChannelSelect
ChannelSelectionEPG.__init__(self)
SelectionEventInfo.__init__(self)
ChannelSelectionEPG.__init__(self)
SelectionEventInfo.__init__(self)
- self["CurrentTime"] = ObsoleteSource(new_source = "global.CurrentTime", removal_date = "2008-01")
-
self["actions"] = ActionMap(["OkCancelActions", "TvRadioActions"],
{
"cancel": self.cancel,
self["actions"] = ActionMap(["OkCancelActions", "TvRadioActions"],
{
"cancel": self.cancel,
@@
-1321,14
+1317,10
@@
class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit, ChannelSelect
self.asciiOff()
self.close(None)
self.asciiOff()
self.close(None)
-from Screens.InfoBarGenerics import InfoBarEvent, InfoBarServiceName
-
-class RadioInfoBar(Screen, InfoBarEvent, InfoBarServiceName):
+class RadioInfoBar(Screen):
def __init__(self, session):
Screen.__init__(self, session)
InfoBarEvent.__init__(self)
def __init__(self, session):
Screen.__init__(self, session)
InfoBarEvent.__init__(self)
- InfoBarServiceName.__init__(self)
- self["CurrentTime"] = ObsoleteSource(new_source = "global.CurrentTime", removal_date = "2008-01")
self["RdsDecoder"] = RdsDecoder(self.session.nav)
self["BlinkingPoint"] = Pixmap()
self["BlinkingPoint"].hide()
self["RdsDecoder"] = RdsDecoder(self.session.nav)
self["BlinkingPoint"] = Pixmap()
self["BlinkingPoint"].hide()