use ChoiceBox for audio selection (audio tracks are now sorted by description)

[vuplus_dvbapp] / lib / python / Screens / ChannelSelection.py

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index 83962e0..9e29839 100644 (file)
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -692,7 +692,7 @@ class ChannelSelectionBase(Screen):
                                                        service = servicelist.getNext()
                                                        if not service.valid(): #check if end of list
                                                                break
-                                                       orbpos = service.getData(4) >> 16
+                                                       orbpos = service.getUnsignedData(4) >> 16
                                                        if service.getPath().find("FROM PROVIDER") != -1:
                                                                service_name = _("Providers")
                                                        else:
@@ -701,9 +701,9 @@ class ChannelSelectionBase(Screen):
                                                                service_name += str(' - %s'%(nimmanager.getSatDescription(orbpos)))
                                                                service.setName(service_name) # why we need this cast?
                                                        except:
-                                                               if orbpos == 0xFFFF0000: #Cable
+                                                               if orbpos == 0xFFFF: #Cable
                                                                        n = ("%s (%s)") % (service_name, _("Cable"))
-                                                               elif orbpos == 0xEEEE0000: #Terrestrial
+                                                               elif orbpos == 0xEEEE: #Terrestrial
                                                                        n = ("%s (%s)") % (service_name, _("Terrestrial"))
                                                                else:
                                                                        if orbpos > 1800: # west