update

PlayStream.py

@@ -339,16 +339,18 @@ class MainScreen(Screen):
             </convert>
     </widget>
     <widget name="pic" position="646,55" size="327,250" alphatest="on" />
-    <widget name="cur" position="610,310" size="400,250" halign="center" font="Regular;20"/>
-
-    <ePixmap name="red"    position="100,530"   zPosition="2" size="140,40" pixmap="skin_default/buttons/red.png" transparent="1" alphatest="on" />
-    <widget name="key_red" position="100,530" size="140,40" valign="center" halign="center" zPosition="4"  foregroundColor="white" font="Regular;20" transparent="1" shadowColor="background" shadowOffset="-2,-2" />
-    <ePixmap name="green"  position="240,530" zPosition="2" size="140,40" pixmap="skin_default/buttons/green.png" transparent="1" alphatest="on" />
-    <widget name="key_green" position="240,530" size="140,40" valign="center" halign="center" zPosition="4"  foregroundColor="white" font="Regular;20" transparent="1" shadowColor="background" shadowOffset="-2,-2" />
-    <ePixmap name="yellow" position="380,530" zPosition="2" size="140,40" pixmap="skin_default/buttons/yellow.png" transparent="1" alphatest="on" />
-    <widget name="key_yellow" position="380,530" size="140,40" valign="center" halign="center" zPosition="4"  foregroundColor="white" font="Regular;20" transparent="1" shadowColor="background" shadowOffset="-2,-2" />
-    <ePixmap name="menu"   position="560,535" zPosition="2" size="140,40"  pixmap="skin_default/buttons/key_menu.png" transparent="1" alphatest="on" />
-    <widget name="key_menu" position="560,530" size="140,40" valign="center" halign="center" zPosition="4"  backgroundColor="blue" foregroundColor="white" font="Regular;20" transparent="1" shadowColor="background" shadowOffset="-2,-2" />
+    <widget name="cur" position="610,300" size="400,250" halign="center" font="Regular;20"/>
+
+    <ePixmap name="exit"   position="10,540" zPosition="2" size="140,40"  pixmap="skin_default/buttons/key_exit.png" transparent="1" alphatest="on" />
+    <widget name="key_exit" position="10,535" size="140,40" valign="center" halign="center" zPosition="4"  backgroundColor="blue" foregroundColor="white" font="Regular;20" transparent="1" shadowColor="background" shadowOffset="-2,-2" />
+    <ePixmap name="red"    position="150,535"   zPosition="2" size="140,40" pixmap="skin_default/buttons/red.png" transparent="1" alphatest="on" />
+    <widget name="key_red" position="150,535" size="140,40" valign="center" halign="center" zPosition="4"  foregroundColor="white" font="Regular;20" transparent="1" shadowColor="background" shadowOffset="-2,-2" />
+    <ePixmap name="green"  position="290,535" zPosition="2" size="140,40" pixmap="skin_default/buttons/green.png" transparent="1" alphatest="on" />
+    <widget name="key_green" position="290,535" size="140,40" valign="center" halign="center" zPosition="4"  foregroundColor="white" font="Regular;20" transparent="1" shadowColor="background" shadowOffset="-2,-2" />
+    <ePixmap name="yellow" position="430,535" zPosition="2" size="140,40" pixmap="skin_default/buttons/yellow.png" transparent="1" alphatest="on" />
+    <widget name="key_yellow" position="430,535" size="140,40" valign="center" halign="center" zPosition="4"  foregroundColor="white" font="Regular;20" transparent="1" shadowColor="background" shadowOffset="-2,-2" />
+    <ePixmap name="menu"   position="610,540" zPosition="2" size="140,40"  pixmap="skin_default/buttons/key_menu.png" transparent="1" alphatest="on" />
+    <widget name="key_menu" position="610,535" size="140,40" valign="center" halign="center" zPosition="4"  backgroundColor="blue" foregroundColor="white" font="Regular;20" transparent="1" shadowColor="background" shadowOffset="-2,-2" />
     
 </screen>"""
 
@@ -357,20 +359,22 @@ class MainScreen(Screen):
         #self.setTitle2("Home")
         self.session = session
         self.e2 = None
-        self["key_red"] = Button(_("Back"))
+        self["key_red"] = Button(_("Exit"))
         self["key_green"] = Button(_("Select"))
         self["key_yellow"] = Button(_("Options"))
-        self["key_menu"] = Button("Menu" )
+        self["key_menu"] = Button("Menu")
+        self["key_exit"] = Button("Back")
         
         self["actions"] = ActionMap(["OkCancelActions", "ColorActions","MenuActions", "NumberActions"],
                                     {
-                                        "cancel": self.Cancel,
+                                        #"cancel": self.Cancel,
                                         "ok": self.Ok,
                                         "green": self.Ok,
-                                        "red": self.Back,
+                                        "red": self.Cancel,
                                         "yellow": self.options_screen,
                                         "blue": self.download_list,
                                         "menu": self.item_menu,
+                                        "cancel": self.Back,
                                     })
         self["list"] = List([])
         self["list"].onSelectionChanged.append(self.SelectionChanged)

PlayStream.wpr

@@ -196,7 +196,7 @@ debug.breakpoints = {loc('gstreamer/player-minimal.py'): {12: (0,
               None,
               1,
               0),
-        986: (0,
+        988: (0,
               None,
               1,
               0),
@@ -204,10 +204,10 @@ debug.breakpoints = {loc('gstreamer/player-minimal.py'): {12: (0,
               None,
               1,
               0),
-        997: (0,
-              None,
-              1,
-              0)},
+        1000: (0,
+               None,
+               1,
+               0)},
                      loc('sources/ltc0.py'): {360: (0,
         None,
         1,
@@ -5037,21 +5037,21 @@ edit.bookmarks = {'Ok': (loc('PlayStream.py'),
         ('MainScreen.Ok',
          243)],
                           'first-line': 237,
-                          'sel-line': 487}),
+                          'sel-line': 491L}),
                   'cb_item_menu': (loc('PlayStream.py'),
                                    {'attrib-starts': [('MainScreen',
         72),
         ('MainScreen.cb_item_menu',
          349)],
                                     'first-line': 364,
-                                    'sel-line': 624}),
+                                    'sel-line': 628L}),
                   'item_menu': (loc('PlayStream.py'),
                                 {'attrib-starts': [('MainScreen',
         69),
         ('MainScreen.item_menu',
          320)],
                                  'first-line': 312,
-                                 'sel-line': 602})}
+                                 'sel-line': 606L})}
 edit.file-encoding = {loc('streams.cfg'): 'utf_8'}
 guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                             'windows': [{'name': '47wqn9r4eCm6RV6BSVqCQM73zP'\
@@ -5063,7 +5063,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                  'current_pages': [0,
                                    0],
                  'full-screen': False,
-                 'notebook_display': 'normal',
+                 'notebook_display': 'tabs only',
                  'notebook_percent': 0.23133716160787532,
                  'override_title': None,
                  'pagelist': [('project',
@@ -5071,9 +5071,9 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                0,
                                {'tree-state': {'file-sort-method': 'by name',
         'list-files-first': False,
-        'tree-states': {'deep': {'expanded-nodes': [(74,),
-        (108,)],
-                                 'selected-nodes': [(69,)],
+        'tree-states': {'deep': {'expanded-nodes': [(73,),
+        (107,)],
+                                 'selected-nodes': [(68,)],
                                  'top-node': (62,)}},
         'tree-style': 'deep'}}),
                               ('snippets',
@@ -5149,7 +5149,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                      ('interactive-search',
                       'wide',
                       0,
-                      {'fScope': {'fFileSetName': u'All Source Files',
+                      {'fScope': {'fFileSetName': 'All Source Files',
                                   'fLocation': None,
                                   'fRecursive': True,
                                   'fType': 'project-files'},
@@ -5161,7 +5161,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                        'fRegexFlags': 46,
                                        'fReplaceText': u'self.',
                                        'fReverse': False,
-                                       'fSearchText': u'eServiceReference',
+                                       'fSearchText': u'exit',
                                        'fStartPos': 0,
                                        'fStyle': 'text',
                                        'fWholeWords': False,
@@ -5174,9 +5174,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                       'fReplaceOnDisk': False,
                                       'fShowFirstMatch': False,
                                       'fShowLineno': True,
-                                      'fShowReplaceWidgets': False},
-                       'replace-entry-expanded': False,
-                       'search-entry-expanded': False}),
+                                      'fShowReplaceWidgets': False}}),
                      ('debug-data',
                       'wide',
                       0,
@@ -5218,16 +5216,16 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         -1,
         -1),
                        'attrib-starts': [],
-                       'first-line': 0,
+                       'first-line': 0L,
                        'folded-linenos': [],
-                       'history': {u'file:C:/Data/Programming/enigma2/PlayStream2/ContentSources.py': ['u'\
-        'rl0\n',
-        'print url0\n']},
+                       'history': {u'file:C:/Data/Programming/enigma2/PlayStream2/ContentSources.py': ['p'\
+        'rint data\n',
+        'print url\n']},
                        'launch-id': None,
-                       'sel-line': 3,
-                       'sel-line-start': 114,
-                       'selection_end': 208,
-                       'selection_start': 114}),
+                       'sel-line': 3L,
+                       'sel-line-start': 97L,
+                       'selection_end': 207L,
+                       'selection_start': 97L}),
                      ('debug-watch',
                       'wide',
                       1,
@@ -5281,31 +5279,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                       {})],
         'primary_view_state': {'editor_states': ('vertical',
         1.0,
-        ({'bookmarks': ([[loc('sources/filmix.py'),
-                          {'attrib-starts': [('Source',
-        24),
-        ('Source.get_content',
-         49)],
-                           'first-line': 107,
-                           'folded-linenos': [],
-                           'sel-line': 120,
-                           'sel-line-start': 4810,
-                           'selection_end': 4810,
-                           'selection_start': 4810},
-                          1481918537.137],
-                         [loc('sources/filmix.py'),
-                          {'attrib-starts': [('Source',
-        24),
-        ('Source.get_streams2',
-         253)],
-                           'first-line': 245,
-                           'folded-linenos': [],
-                           'sel-line': 253,
-                           'sel-line-start': 11549,
-                           'selection_end': 11573,
-                           'selection_start': 11573},
-                          1481918585.247],
-                         [loc('ContentSources.py'),
+        ({'bookmarks': ([[loc('ContentSources.py'),
                           {'attrib-starts': [('ContentSources',
         15),
         ('ContentSources.get_streams',
@@ -5316,146 +5290,149 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                            'sel-line-start': 3910L,
                            'selection_end': 3925L,
                            'selection_start': 3925L},
-                          1483388176.98],
-                         [loc('PlayStream.py'),
-                          {'attrib-starts': [('make_service',
-        54)],
-                           'first-line': 53L,
-                           'folded-linenos': [],
-                           'sel-line': 69L,
-                           'sel-line-start': 2647L,
-                           'selection_end': 2658L,
-                           'selection_start': 2651L},
-                          1483388277.326],
-                         [loc('sources/viaplay.py'),
+                          1483389395.672],
+                         [loc('sources/filmix.py'),
                           {'attrib-starts': [('Source',
-        26),
-        ('Source.get_streams',
-         308)],
-                           'first-line': 377L,
+        24),
+        ('Source.get_content',
+         49)],
+                           'first-line': 103L,
+                           'folded-linenos': [],
+                           'sel-line': 119L,
+                           'sel-line-start': 4774L,
+                           'selection_end': 4774L,
+                           'selection_start': 4774L},
+                          1483389454.103],
+                         [loc('util.py'),
+                          {'attrib-starts': [('play_video',
+        49)],
+                           'first-line': 67L,
                            'folded-linenos': [],
-                           'sel-line': 381L,
-                           'sel-line-start': 18636L,
-                           'selection_end': 18673L,
-                           'selection_start': 18673L},
-                          1483388281.345],
+                           'sel-line': 84L,
+                           'sel-line-start': 2507L,
+                           'selection_end': 2507L,
+                           'selection_start': 2507L},
+                          1483390961.973],
                          [loc('PlayStream.py'),
                           {'attrib-starts': [('make_service',
         54)],
-                           'first-line': 53L,
+                           'first-line': 2L,
                            'folded-linenos': [],
                            'sel-line': 69L,
                            'sel-line-start': 2647L,
                            'selection_end': 2658L,
                            'selection_start': 2651L},
-                          1483388283.181],
-                         [loc('sources/euronews.py'),
-                          {'attrib-starts': [('Source',
-        21),
-        ('Source.get_streams',
-         144)],
-                           'first-line': 130L,
-                           'folded-linenos': [],
-                           'sel-line': 145L,
-                           'sel-line-start': 6942L,
-                           'selection_end': 7121L,
-                           'selection_start': 6942L},
-                          1483388283.786],
+                          1483390966.456],
                          [loc('PlayStream.py'),
                           {'attrib-starts': [('make_service',
         54)],
-                           'first-line': 53L,
+                           'first-line': 58L,
                            'folded-linenos': [],
                            'sel-line': 69L,
                            'sel-line-start': 2647L,
-                           'selection_end': 2658L,
-                           'selection_start': 2651L},
-                          1483388285.179],
-                         [loc('sources/iplayer.py'),
-                          {'attrib-starts': [('Source',
-        23),
-        ('Source.get_streams',
-         228)],
-                           'first-line': 245L,
+                           'selection_end': 2669L,
+                           'selection_start': 2662L},
+                          1483390968.266],
+                         [loc('PlayStream.py'),
+                          {'attrib-starts': [('MainScreen',
+        324)],
+                           'first-line': 327L,
                            'folded-linenos': [],
-                           'sel-line': 260L,
-                           'sel-line-start': 13310L,
-                           'selection_end': 13396L,
-                           'selection_start': 13396L},
-                          1483388287.071],
+                           'sel-line': 343L,
+                           'sel-line-start': 13445L,
+                           'selection_end': 13467L,
+                           'selection_start': 13464L},
+                          1483390972.427],
                          [loc('PlayStream.py'),
-                          {'attrib-starts': [('make_service',
-        54)],
-                           'first-line': 53L,
+                          {'attrib-starts': [('MainScreen',
+        324)],
+                           'first-line': 327L,
                            'folded-linenos': [],
-                           'sel-line': 69L,
-                           'sel-line-start': 2647L,
-                           'selection_end': 2658L,
-                           'selection_start': 2651L},
-                          1483388291.054],
-                         [loc('ChoiceBox.py'),
-                          {'attrib-starts': [('ChoiceBox2',
-        8),
-        ('ChoiceBox2.__init__',
-         23)],
-                           'first-line': 0L,
+                           'sel-line': 343L,
+                           'sel-line-start': 13445L,
+                           'selection_end': 13553L,
+                           'selection_start': 13550L},
+                          1483390973.298],
+                         [loc('PlayStream.py'),
+                          {'attrib-starts': [('MainScreen',
+        324)],
+                           'first-line': 333L,
                            'folded-linenos': [],
-                           'sel-line': 44L,
-                           'sel-line-start': 1664L,
-                           'selection_end': 1702L,
-                           'selection_start': 1694L},
-                          1483388291.692],
+                           'sel-line': 344L,
+                           'sel-line-start': 13593L,
+                           'selection_end': 13618L,
+                           'selection_start': 13615L},
+                          1483390973.854],
                          [loc('PlayStream.py'),
-                          {'attrib-starts': [('make_service',
-        54)],
-                           'first-line': 53L,
+                          {'attrib-starts': [('MainScreen',
+        324),
+        ('MainScreen.__init__',
+         356)],
+                           'first-line': 363L,
                            'folded-linenos': [],
-                           'sel-line': 69L,
-                           'sel-line-start': 2647L,
-                           'selection_end': 2658L,
-                           'selection_start': 2651L},
-                          1483388292.719],
-                         [loc('../python/Components/GUISkin.py'),
-                          {'attrib-starts': [('GUISkin',
-        5),
-        ('GUISkin.__init__',
-         8)],
-                           'first-line': 17L,
+                           'sel-line': 376L,
+                           'sel-line-start': 16306L,
+                           'selection_end': 16351L,
+                           'selection_start': 16347L},
+                          1483391637.716],
+                         [loc('PlayStream.py'),
+                          {'attrib-starts': [('MainScreen',
+        324),
+        ('MainScreen.__init__',
+         356)],
+                           'first-line': 356L,
                            'folded-linenos': [],
-                           'sel-line': 9L,
-                           'sel-line-start': 207L,
-                           'selection_end': 235L,
-                           'selection_start': 225L},
-                          1483388293.429],
+                           'sel-line': 361L,
+                           'sel-line-start': 15492L,
+                           'selection_end': 15532L,
+                           'selection_start': 15528L},
+                          1483391639.28],
                          [loc('PlayStream.py'),
-                          {'attrib-starts': [('make_service',
-        54)],
-                           'first-line': 53L,
+                          {'attrib-starts': [('MainScreen',
+        324),
+        ('MainScreen.__init__',
+         356)],
+                           'first-line': 356L,
                            'folded-linenos': [],
-                           'sel-line': 69L,
-                           'sel-line-start': 2647L,
-                           'selection_end': 2658L,
-                           'selection_start': 2651L},
-                          1483388294.906],
-                         [loc('sniplets.py'),
-                          {'attrib-starts': [],
-                           'first-line': 0L,
+                           'sel-line': 362L,
+                           'sel-line-start': 15536L,
+                           'selection_end': 15546L,
+                           'selection_start': 15545L},
+                          1483391639.829],
+                         [loc('PlayStream.py'),
+                          {'attrib-starts': [('MainScreen',
+        324),
+        ('MainScreen.__init__',
+         356)],
+                           'first-line': 356L,
                            'folded-linenos': [],
-                           'sel-line': 1L,
-                           'sel-line-start': 28L,
-                           'selection_end': 82L,
-                           'selection_start': 51L},
-                          1483388301.472],
+                           'sel-line': 365L,
+                           'sel-line-start': 15676L,
+                           'selection_end': 15696L,
+                           'selection_start': 15694L},
+                          1483391640.578],
                          [loc('PlayStream.py'),
-                          {'attrib-starts': [('make_service',
-        54)],
-                           'first-line': 53L,
+                          {'attrib-starts': [('MainScreen',
+        324),
+        ('MainScreen.__init__',
+         356)],
+                           'first-line': 356L,
                            'folded-linenos': [],
-                           'sel-line': 69L,
-                           'sel-line-start': 2647L,
-                           'selection_end': 2658L,
-                           'selection_start': 2651L},
-                          1483388306.279],
+                           'sel-line': 365L,
+                           'sel-line-start': 15676L,
+                           'selection_end': 15697L,
+                           'selection_start': 15694L},
+                          1483391641.094],
+                         [loc('PlayStream.py'),
+                          {'attrib-starts': [('MainScreen',
+        324)],
+                           'first-line': 335L,
+                           'folded-linenos': [],
+                           'sel-line': 352L,
+                           'sel-line-start': 15077L,
+                           'selection_end': 15122L,
+                           'selection_start': 15122L},
+                          1483397133.215],
                          [loc('ContentSources.py'),
                           {'attrib-starts': [('ContentSources',
         15),
@@ -5467,37 +5444,58 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                            'sel-line-start': 3910L,
                            'selection_end': 3925L,
                            'selection_start': 3925L},
-                          1483388348.357],
+                          1483397166.213],
                          [loc('sources/filmix.py'),
-                          {'attrib-starts': [],
-                           'first-line': 17L,
+                          {'attrib-starts': [('Source',
+        24),
+        ('Source.get_content',
+         49)],
+                           'first-line': 88L,
                            'folded-linenos': [],
-                           'sel-line': 22L,
-                           'sel-line-start': 622L,
-                           'selection_end': 622L,
-                           'selection_start': 622L},
-                          1483388877.819],
+                           'sel-line': 113L,
+                           'sel-line-start': 4479L,
+                           'selection_end': 4479L,
+                           'selection_start': 4479L},
+                          1483468572.85],
                          [loc('ContentSources.py'),
-                          {'attrib-starts': [('ContentSources',
-        15),
-        ('ContentSources.get_streams',
-         74)],
-                           'first-line': 0L,
+                          {'attrib-starts': [],
+                           'first-line': 133L,
                            'folded-linenos': [],
-                           'sel-line': 96L,
-                           'sel-line-start': 3910L,
-                           'selection_end': 3925L,
-                           'selection_start': 3925L},
-                          1483388887.61],
-                         [loc('sources/filmix.py'),
+                           'sel-line': 150L,
+                           'sel-line-start': 5363L,
+                           'selection_end': 5363L,
+                           'selection_start': 5363L},
+                          1483469182.966],
+                         [loc('sources/ltc.py'),
+                          {'attrib-starts': [],
+                           'first-line': 11L,
+                           'folded-linenos': [],
+                           'sel-line': 16L,
+                           'sel-line-start': 552L,
+                           'selection_end': 552L,
+                           'selection_start': 552L},
+                          1483469582.584],
+                         [loc('ContentSources.py'),
                           {'attrib-starts': [],
-                           'first-line': 17L,
+                           'first-line': 133L,
+                           'folded-linenos': [],
+                           'sel-line': 150L,
+                           'sel-line-start': 5363L,
+                           'selection_end': 5363L,
+                           'selection_start': 5363L},
+                          1483470729.597],
+                         [loc('sources/ltc.py'),
+                          {'attrib-starts': [('Source',
+        24),
+        ('Source.get_content',
+         71)],
+                           'first-line': 67L,
                            'folded-linenos': [],
-                           'sel-line': 22L,
-                           'sel-line-start': 622L,
-                           'selection_end': 622L,
-                           'selection_start': 622L},
-                          1483389381.844]],
+                           'sel-line': 72L,
+                           'sel-line-start': 2705L,
+                           'selection_end': 2705L,
+                           'selection_start': 2705L},
+                          1483470974.796]],
                         20),
           'current-loc': loc('ContentSources.py'),
           'editor-state-list': [(loc('plugin.py'),
@@ -5510,34 +5508,31 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                   'selection_end': 208,
                                   'selection_start': 199}),
                                 (loc('PlayStream.py'),
-                                 {'attrib-starts': [('make_service',
-        54)],
-                                  'first-line': 53L,
+                                 {'attrib-starts': [('MainScreen',
+        324)],
+                                  'first-line': 335L,
                                   'folded-linenos': [],
-                                  'sel-line': 69L,
-                                  'sel-line-start': 2647L,
-                                  'selection_end': 2658L,
-                                  'selection_start': 2651L}),
+                                  'sel-line': 352L,
+                                  'sel-line-start': 15077L,
+                                  'selection_end': 15122L,
+                                  'selection_start': 15122L}),
                                 (loc('util.py'),
                                  {'attrib-starts': [('play_video',
         49)],
-                                  'first-line': 67,
+                                  'first-line': 67L,
                                   'folded-linenos': [],
-                                  'sel-line': 84,
-                                  'sel-line-start': 2507,
-                                  'selection_end': 2507,
-                                  'selection_start': 2507}),
+                                  'sel-line': 84L,
+                                  'sel-line-start': 2507L,
+                                  'selection_end': 2507L,
+                                  'selection_start': 2507L}),
                                 (loc('ContentSources.py'),
-                                 {'attrib-starts': [('ContentSources',
-        15),
-        ('ContentSources.get_streams',
-         74)],
-                                  'first-line': 0L,
+                                 {'attrib-starts': [],
+                                  'first-line': 133L,
                                   'folded-linenos': [],
-                                  'sel-line': 96L,
-                                  'sel-line-start': 3910L,
-                                  'selection_end': 3925L,
-                                  'selection_start': 3925L}),
+                                  'sel-line': 150L,
+                                  'sel-line-start': 5363L,
+                                  'selection_end': 5363L,
+                                  'selection_start': 5363L}),
                                 (loc('sources/kinofilmnet.py'),
                                  {'attrib-starts': [('Source',
         23),
@@ -5554,12 +5549,12 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         24),
         ('Source.get_content',
          71)],
-                                  'first-line': 67,
+                                  'first-line': 67L,
                                   'folded-linenos': [],
-                                  'sel-line': 72,
-                                  'sel-line-start': 2705,
-                                  'selection_end': 2705,
-                                  'selection_start': 2705}),
+                                  'sel-line': 72L,
+                                  'sel-line-start': 2705L,
+                                  'selection_end': 2705L,
+                                  'selection_start': 2705L}),
                                 (loc('resolvers/hdgo.py'),
                                  {'attrib-starts': [('supports',
         37)],
@@ -5570,13 +5565,16 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                   'selection_end': 1163,
                                   'selection_start': 1163}),
                                 (loc('sources/filmix.py'),
-                                 {'attrib-starts': [],
-                                  'first-line': 17L,
+                                 {'attrib-starts': [('Source',
+        24),
+        ('Source.get_content',
+         49)],
+                                  'first-line': 88L,
                                   'folded-linenos': [],
-                                  'sel-line': 22L,
-                                  'sel-line-start': 622L,
-                                  'selection_end': 622L,
-                                  'selection_start': 622L}),
+                                  'sel-line': 113L,
+                                  'sel-line-start': 4479L,
+                                  'selection_end': 4479L,
+                                  'selection_start': 4479L}),
                                 (loc('sources/replay.py'),
                                  {'attrib-starts': [('Source',
         25),
@@ -5919,12 +5917,12 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                 (loc('util.py'),
                                  {'attrib-starts': [('player',
         86)],
-                                  'first-line': 89,
+                                  'first-line': 89L,
                                   'folded-linenos': [],
-                                  'sel-line': 103,
-                                  'sel-line-start': 3402,
-                                  'selection_end': 3421,
-                                  'selection_start': 3421}),
+                                  'sel-line': 103L,
+                                  'sel-line-start': 3402L,
+                                  'selection_end': 3421L,
+                                  'selection_start': 3421L}),
                                 (loc('sources/replay.py'),
                                  {'attrib-starts': [('Source',
         25),
@@ -5948,15 +5946,15 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
           loc('sources/ustvnow.py'),
           loc('util.py'),
           loc('sources/replay.py')])),
-                               'open_files': [u'plugin.py',
+                               'open_files': [u'PlayStream.py',
+        u'plugin.py',
         u'resolvers/hdgo.py',
         u'sources/kinofilmnet.py',
-        u'sources/ltc.py',
         u'sources/replay.py',
         u'sources/ustvnow.py',
         u'util.py',
-        u'PlayStream.py',
         u'sources/filmix.py',
+        u'sources/ltc.py',
         u'ContentSources.py']},
         'saved_notebook_display': None,
         'split_percents': {0: 0.33756345177664976},
@@ -5973,13 +5971,13 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                          2405,
                          1376)}]}
 guimgr.recent-documents = [loc('ContentSources.py'),
-                           loc('sources/filmix.py'),
+                           loc('sources/ltc.py'),
                            loc('PlayStream.py'),
                            loc('util.py'),
+                           loc('sources/filmix.py'),
                            loc('sources/ustvnow.py'),
                            loc('sources/kinofilmnet.py'),
                            loc('sources/replay.py'),
-                           loc('sources/ltc.py'),
                            loc('resolvers/hdgo.py'),
                            loc('plugin.py')]
 guimgr.visual-state = {loc('../../Kodi/test2/plugin.video.aaa/addon.py'): {'a'\
@@ -6673,14 +6671,6 @@ guimgr.visual-state = {loc('../../Kodi/test2/plugin.video.aaa/addon.py'): {'a'\
         'sel-line-start': 4043,
         'selection_end': 4043,
         'selection_start': 4043},
-                       loc('../python/Components/GUISkin.py'): {'attrib-star'\
-        'ts': [],
-        'first-line': 0L,
-        'folded-linenos': [],
-        'sel-line': 0L,
-        'sel-line-start': 0L,
-        'selection_end': 0L,
-        'selection_start': 0L},
                        loc('../../../../Python27/Lib/site-packages/gi/overrides/Gst.py'): {'a'\
         'ttrib-starts': [],
         'first-line': 0,
@@ -6689,15 +6679,14 @@ guimgr.visual-state = {loc('../../Kodi/test2/plugin.video.aaa/addon.py'): {'a'\
         'sel-line-start': 0,
         'selection_end': 0,
         'selection_start': 0},
-                       loc('../../../../Python27/Lib/re.py'): {'attrib-start'\
-        's': [('findall',
-               172)],
-        'first-line': 162,
+                       loc('../python/Components/GUISkin.py'): {'attrib-star'\
+        'ts': [],
+        'first-line': 0L,
         'folded-linenos': [],
-        'sel-line': 180,
-        'sel-line-start': 8708,
-        'selection_end': 8708,
-        'selection_start': 8708},
+        'sel-line': 0L,
+        'sel-line-start': 0L,
+        'selection_end': 0L,
+        'selection_start': 0L},
                        loc('../../../../Python27/lib/BaseHTTPServer.py'): {'a'\
         'ttrib-starts': [('BaseHTTPRequestHandler',
                           113),
@@ -6718,6 +6707,15 @@ guimgr.visual-state = {loc('../../Kodi/test2/plugin.video.aaa/addon.py'): {'a'\
         'sel-line-start': 2478,
         'selection_end': 2478,
         'selection_start': 2478},
+                       loc('../../../../Python27/lib/re.py'): {'attrib-start'\
+        's': [('findall',
+               172)],
+        'first-line': 162,
+        'folded-linenos': [],
+        'sel-line': 180,
+        'sel-line-start': 8708,
+        'selection_end': 8708,
+        'selection_start': 8708},
                        loc('../../../../Python27/lib/site-packages/gi/__init__.py'): {'a'\
         'ttrib-starts': [],
         'first-line': 24,
@@ -6782,7 +6780,8 @@ proj.pypath = {None: ('custom',
                        u''])}
 search.replace-history = [u'self',
                           u'current']
-search.search-history = [u'eServiceReference',
+search.search-history = [u'red',
+                         u'eServiceReference',
                          u'service',
                          u'gst',
                          u'timer',
@@ -6800,8 +6799,7 @@ search.search-history = [u'eServiceReference',
                          u'List',
                          u'ChoiceList',
                          u'choiceli',
-                         u'ChoiceEntryComponent',
-                         u'list']
+                         u'ChoiceEntryComponent']
 testing.stored-results = (1,
                           [],
                           {})

changelog.md

@@ -1,3 +1,8 @@
+**0.5l** (02.01.2016):
+- streamproxy pārsaukts par playstreamproxy lai nekonfliktē ar enigma2-streamproxy pluginu
+- samainītas vietām Exit un Back pogas
+- izlabots nestrādājošais filmix.net
+
 **0.5j** (03.12.2016):
 - novērstas dažādas kļūdas saistībā ar imidžu nesaderību
 
@@ -10,7 +15,7 @@
 
 **0.4d** (03.08.2016):
 - Euronews live un arhīvs
-
+.
 **0.4c** (26.07.2016):  
 - BBC iPlayer saturs (strādā tikai UK vai ar VPN/smartDNS)
 - lejupielādes foldera uzdošana