Ivars 7 years ago
parent
commit
c24a3e9250
4 changed files with 270 additions and 263 deletions
  1. 18
    14
      PlayStream.py
  2. 246
    248
      PlayStream.wpr
  3. 6
    1
      changelog.md
  4. BIN
      release/enigma2-plugin-extensions-playstream_0.5l.ipk

+ 18
- 14
PlayStream.py View File

339
             </convert>
339
             </convert>
340
     </widget>
340
     </widget>
341
     <widget name="pic" position="646,55" size="327,250" alphatest="on" />
341
     <widget name="pic" position="646,55" size="327,250" alphatest="on" />
342
-    <widget name="cur" position="610,310" size="400,250" halign="center" font="Regular;20"/>
343
-
344
-    <ePixmap name="red"    position="100,530"   zPosition="2" size="140,40" pixmap="skin_default/buttons/red.png" transparent="1" alphatest="on" />
345
-    <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" />
346
-    <ePixmap name="green"  position="240,530" zPosition="2" size="140,40" pixmap="skin_default/buttons/green.png" transparent="1" alphatest="on" />
347
-    <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" />
348
-    <ePixmap name="yellow" position="380,530" zPosition="2" size="140,40" pixmap="skin_default/buttons/yellow.png" transparent="1" alphatest="on" />
349
-    <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" />
350
-    <ePixmap name="menu"   position="560,535" zPosition="2" size="140,40"  pixmap="skin_default/buttons/key_menu.png" transparent="1" alphatest="on" />
351
-    <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" />
342
+    <widget name="cur" position="610,300" size="400,250" halign="center" font="Regular;20"/>
343
+
344
+    <ePixmap name="exit"   position="10,540" zPosition="2" size="140,40"  pixmap="skin_default/buttons/key_exit.png" transparent="1" alphatest="on" />
345
+    <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" />
346
+    <ePixmap name="red"    position="150,535"   zPosition="2" size="140,40" pixmap="skin_default/buttons/red.png" transparent="1" alphatest="on" />
347
+    <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" />
348
+    <ePixmap name="green"  position="290,535" zPosition="2" size="140,40" pixmap="skin_default/buttons/green.png" transparent="1" alphatest="on" />
349
+    <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" />
350
+    <ePixmap name="yellow" position="430,535" zPosition="2" size="140,40" pixmap="skin_default/buttons/yellow.png" transparent="1" alphatest="on" />
351
+    <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" />
352
+    <ePixmap name="menu"   position="610,540" zPosition="2" size="140,40"  pixmap="skin_default/buttons/key_menu.png" transparent="1" alphatest="on" />
353
+    <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" />
352
     
354
     
353
 </screen>"""
355
 </screen>"""
354
 
356
 
357
         #self.setTitle2("Home")
359
         #self.setTitle2("Home")
358
         self.session = session
360
         self.session = session
359
         self.e2 = None
361
         self.e2 = None
360
-        self["key_red"] = Button(_("Back"))
362
+        self["key_red"] = Button(_("Exit"))
361
         self["key_green"] = Button(_("Select"))
363
         self["key_green"] = Button(_("Select"))
362
         self["key_yellow"] = Button(_("Options"))
364
         self["key_yellow"] = Button(_("Options"))
363
-        self["key_menu"] = Button("Menu" )
365
+        self["key_menu"] = Button("Menu")
366
+        self["key_exit"] = Button("Back")
364
         
367
         
365
         self["actions"] = ActionMap(["OkCancelActions", "ColorActions","MenuActions", "NumberActions"],
368
         self["actions"] = ActionMap(["OkCancelActions", "ColorActions","MenuActions", "NumberActions"],
366
                                     {
369
                                     {
367
-                                        "cancel": self.Cancel,
370
+                                        #"cancel": self.Cancel,
368
                                         "ok": self.Ok,
371
                                         "ok": self.Ok,
369
                                         "green": self.Ok,
372
                                         "green": self.Ok,
370
-                                        "red": self.Back,
373
+                                        "red": self.Cancel,
371
                                         "yellow": self.options_screen,
374
                                         "yellow": self.options_screen,
372
                                         "blue": self.download_list,
375
                                         "blue": self.download_list,
373
                                         "menu": self.item_menu,
376
                                         "menu": self.item_menu,
377
+                                        "cancel": self.Back,
374
                                     })
378
                                     })
375
         self["list"] = List([])
379
         self["list"] = List([])
376
         self["list"].onSelectionChanged.append(self.SelectionChanged)
380
         self["list"].onSelectionChanged.append(self.SelectionChanged)

+ 246
- 248
PlayStream.wpr View File

196
               None,
196
               None,
197
               1,
197
               1,
198
               0),
198
               0),
199
-        986: (0,
199
+        988: (0,
200
               None,
200
               None,
201
               1,
201
               1,
202
               0),
202
               0),
204
               None,
204
               None,
205
               1,
205
               1,
206
               0),
206
               0),
207
-        997: (0,
208
-              None,
209
-              1,
210
-              0)},
207
+        1000: (0,
208
+               None,
209
+               1,
210
+               0)},
211
                      loc('sources/ltc0.py'): {360: (0,
211
                      loc('sources/ltc0.py'): {360: (0,
212
         None,
212
         None,
213
         1,
213
         1,
5037
         ('MainScreen.Ok',
5037
         ('MainScreen.Ok',
5038
          243)],
5038
          243)],
5039
                           'first-line': 237,
5039
                           'first-line': 237,
5040
-                          'sel-line': 487}),
5040
+                          'sel-line': 491L}),
5041
                   'cb_item_menu': (loc('PlayStream.py'),
5041
                   'cb_item_menu': (loc('PlayStream.py'),
5042
                                    {'attrib-starts': [('MainScreen',
5042
                                    {'attrib-starts': [('MainScreen',
5043
         72),
5043
         72),
5044
         ('MainScreen.cb_item_menu',
5044
         ('MainScreen.cb_item_menu',
5045
          349)],
5045
          349)],
5046
                                     'first-line': 364,
5046
                                     'first-line': 364,
5047
-                                    'sel-line': 624}),
5047
+                                    'sel-line': 628L}),
5048
                   'item_menu': (loc('PlayStream.py'),
5048
                   'item_menu': (loc('PlayStream.py'),
5049
                                 {'attrib-starts': [('MainScreen',
5049
                                 {'attrib-starts': [('MainScreen',
5050
         69),
5050
         69),
5051
         ('MainScreen.item_menu',
5051
         ('MainScreen.item_menu',
5052
          320)],
5052
          320)],
5053
                                  'first-line': 312,
5053
                                  'first-line': 312,
5054
-                                 'sel-line': 602})}
5054
+                                 'sel-line': 606L})}
5055
 edit.file-encoding = {loc('streams.cfg'): 'utf_8'}
5055
 edit.file-encoding = {loc('streams.cfg'): 'utf_8'}
5056
 guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
5056
 guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
5057
                             'windows': [{'name': '47wqn9r4eCm6RV6BSVqCQM73zP'\
5057
                             'windows': [{'name': '47wqn9r4eCm6RV6BSVqCQM73zP'\
5063
                  'current_pages': [0,
5063
                  'current_pages': [0,
5064
                                    0],
5064
                                    0],
5065
                  'full-screen': False,
5065
                  'full-screen': False,
5066
-                 'notebook_display': 'normal',
5066
+                 'notebook_display': 'tabs only',
5067
                  'notebook_percent': 0.23133716160787532,
5067
                  'notebook_percent': 0.23133716160787532,
5068
                  'override_title': None,
5068
                  'override_title': None,
5069
                  'pagelist': [('project',
5069
                  'pagelist': [('project',
5071
                                0,
5071
                                0,
5072
                                {'tree-state': {'file-sort-method': 'by name',
5072
                                {'tree-state': {'file-sort-method': 'by name',
5073
         'list-files-first': False,
5073
         'list-files-first': False,
5074
-        'tree-states': {'deep': {'expanded-nodes': [(74,),
5075
-        (108,)],
5076
-                                 'selected-nodes': [(69,)],
5074
+        'tree-states': {'deep': {'expanded-nodes': [(73,),
5075
+        (107,)],
5076
+                                 'selected-nodes': [(68,)],
5077
                                  'top-node': (62,)}},
5077
                                  'top-node': (62,)}},
5078
         'tree-style': 'deep'}}),
5078
         'tree-style': 'deep'}}),
5079
                               ('snippets',
5079
                               ('snippets',
5149
                      ('interactive-search',
5149
                      ('interactive-search',
5150
                       'wide',
5150
                       'wide',
5151
                       0,
5151
                       0,
5152
-                      {'fScope': {'fFileSetName': u'All Source Files',
5152
+                      {'fScope': {'fFileSetName': 'All Source Files',
5153
                                   'fLocation': None,
5153
                                   'fLocation': None,
5154
                                   'fRecursive': True,
5154
                                   'fRecursive': True,
5155
                                   'fType': 'project-files'},
5155
                                   'fType': 'project-files'},
5161
                                        'fRegexFlags': 46,
5161
                                        'fRegexFlags': 46,
5162
                                        'fReplaceText': u'self.',
5162
                                        'fReplaceText': u'self.',
5163
                                        'fReverse': False,
5163
                                        'fReverse': False,
5164
-                                       'fSearchText': u'eServiceReference',
5164
+                                       'fSearchText': u'exit',
5165
                                        'fStartPos': 0,
5165
                                        'fStartPos': 0,
5166
                                        'fStyle': 'text',
5166
                                        'fStyle': 'text',
5167
                                        'fWholeWords': False,
5167
                                        'fWholeWords': False,
5174
                                       'fReplaceOnDisk': False,
5174
                                       'fReplaceOnDisk': False,
5175
                                       'fShowFirstMatch': False,
5175
                                       'fShowFirstMatch': False,
5176
                                       'fShowLineno': True,
5176
                                       'fShowLineno': True,
5177
-                                      'fShowReplaceWidgets': False},
5178
-                       'replace-entry-expanded': False,
5179
-                       'search-entry-expanded': False}),
5177
+                                      'fShowReplaceWidgets': False}}),
5180
                      ('debug-data',
5178
                      ('debug-data',
5181
                       'wide',
5179
                       'wide',
5182
                       0,
5180
                       0,
5218
         -1,
5216
         -1,
5219
         -1),
5217
         -1),
5220
                        'attrib-starts': [],
5218
                        'attrib-starts': [],
5221
-                       'first-line': 0,
5219
+                       'first-line': 0L,
5222
                        'folded-linenos': [],
5220
                        'folded-linenos': [],
5223
-                       'history': {u'file:C:/Data/Programming/enigma2/PlayStream2/ContentSources.py': ['u'\
5224
-        'rl0\n',
5225
-        'print url0\n']},
5221
+                       'history': {u'file:C:/Data/Programming/enigma2/PlayStream2/ContentSources.py': ['p'\
5222
+        'rint data\n',
5223
+        'print url\n']},
5226
                        'launch-id': None,
5224
                        'launch-id': None,
5227
-                       'sel-line': 3,
5228
-                       'sel-line-start': 114,
5229
-                       'selection_end': 208,
5230
-                       'selection_start': 114}),
5225
+                       'sel-line': 3L,
5226
+                       'sel-line-start': 97L,
5227
+                       'selection_end': 207L,
5228
+                       'selection_start': 97L}),
5231
                      ('debug-watch',
5229
                      ('debug-watch',
5232
                       'wide',
5230
                       'wide',
5233
                       1,
5231
                       1,
5281
                       {})],
5279
                       {})],
5282
         'primary_view_state': {'editor_states': ('vertical',
5280
         'primary_view_state': {'editor_states': ('vertical',
5283
         1.0,
5281
         1.0,
5284
-        ({'bookmarks': ([[loc('sources/filmix.py'),
5285
-                          {'attrib-starts': [('Source',
5286
-        24),
5287
-        ('Source.get_content',
5288
-         49)],
5289
-                           'first-line': 107,
5290
-                           'folded-linenos': [],
5291
-                           'sel-line': 120,
5292
-                           'sel-line-start': 4810,
5293
-                           'selection_end': 4810,
5294
-                           'selection_start': 4810},
5295
-                          1481918537.137],
5296
-                         [loc('sources/filmix.py'),
5297
-                          {'attrib-starts': [('Source',
5298
-        24),
5299
-        ('Source.get_streams2',
5300
-         253)],
5301
-                           'first-line': 245,
5302
-                           'folded-linenos': [],
5303
-                           'sel-line': 253,
5304
-                           'sel-line-start': 11549,
5305
-                           'selection_end': 11573,
5306
-                           'selection_start': 11573},
5307
-                          1481918585.247],
5308
-                         [loc('ContentSources.py'),
5282
+        ({'bookmarks': ([[loc('ContentSources.py'),
5309
                           {'attrib-starts': [('ContentSources',
5283
                           {'attrib-starts': [('ContentSources',
5310
         15),
5284
         15),
5311
         ('ContentSources.get_streams',
5285
         ('ContentSources.get_streams',
5316
                            'sel-line-start': 3910L,
5290
                            'sel-line-start': 3910L,
5317
                            'selection_end': 3925L,
5291
                            'selection_end': 3925L,
5318
                            'selection_start': 3925L},
5292
                            'selection_start': 3925L},
5319
-                          1483388176.98],
5320
-                         [loc('PlayStream.py'),
5321
-                          {'attrib-starts': [('make_service',
5322
-        54)],
5323
-                           'first-line': 53L,
5324
-                           'folded-linenos': [],
5325
-                           'sel-line': 69L,
5326
-                           'sel-line-start': 2647L,
5327
-                           'selection_end': 2658L,
5328
-                           'selection_start': 2651L},
5329
-                          1483388277.326],
5330
-                         [loc('sources/viaplay.py'),
5293
+                          1483389395.672],
5294
+                         [loc('sources/filmix.py'),
5331
                           {'attrib-starts': [('Source',
5295
                           {'attrib-starts': [('Source',
5332
-        26),
5333
-        ('Source.get_streams',
5334
-         308)],
5335
-                           'first-line': 377L,
5296
+        24),
5297
+        ('Source.get_content',
5298
+         49)],
5299
+                           'first-line': 103L,
5300
+                           'folded-linenos': [],
5301
+                           'sel-line': 119L,
5302
+                           'sel-line-start': 4774L,
5303
+                           'selection_end': 4774L,
5304
+                           'selection_start': 4774L},
5305
+                          1483389454.103],
5306
+                         [loc('util.py'),
5307
+                          {'attrib-starts': [('play_video',
5308
+        49)],
5309
+                           'first-line': 67L,
5336
                            'folded-linenos': [],
5310
                            'folded-linenos': [],
5337
-                           'sel-line': 381L,
5338
-                           'sel-line-start': 18636L,
5339
-                           'selection_end': 18673L,
5340
-                           'selection_start': 18673L},
5341
-                          1483388281.345],
5311
+                           'sel-line': 84L,
5312
+                           'sel-line-start': 2507L,
5313
+                           'selection_end': 2507L,
5314
+                           'selection_start': 2507L},
5315
+                          1483390961.973],
5342
                          [loc('PlayStream.py'),
5316
                          [loc('PlayStream.py'),
5343
                           {'attrib-starts': [('make_service',
5317
                           {'attrib-starts': [('make_service',
5344
         54)],
5318
         54)],
5345
-                           'first-line': 53L,
5319
+                           'first-line': 2L,
5346
                            'folded-linenos': [],
5320
                            'folded-linenos': [],
5347
                            'sel-line': 69L,
5321
                            'sel-line': 69L,
5348
                            'sel-line-start': 2647L,
5322
                            'sel-line-start': 2647L,
5349
                            'selection_end': 2658L,
5323
                            'selection_end': 2658L,
5350
                            'selection_start': 2651L},
5324
                            'selection_start': 2651L},
5351
-                          1483388283.181],
5352
-                         [loc('sources/euronews.py'),
5353
-                          {'attrib-starts': [('Source',
5354
-        21),
5355
-        ('Source.get_streams',
5356
-         144)],
5357
-                           'first-line': 130L,
5358
-                           'folded-linenos': [],
5359
-                           'sel-line': 145L,
5360
-                           'sel-line-start': 6942L,
5361
-                           'selection_end': 7121L,
5362
-                           'selection_start': 6942L},
5363
-                          1483388283.786],
5325
+                          1483390966.456],
5364
                          [loc('PlayStream.py'),
5326
                          [loc('PlayStream.py'),
5365
                           {'attrib-starts': [('make_service',
5327
                           {'attrib-starts': [('make_service',
5366
         54)],
5328
         54)],
5367
-                           'first-line': 53L,
5329
+                           'first-line': 58L,
5368
                            'folded-linenos': [],
5330
                            'folded-linenos': [],
5369
                            'sel-line': 69L,
5331
                            'sel-line': 69L,
5370
                            'sel-line-start': 2647L,
5332
                            'sel-line-start': 2647L,
5371
-                           'selection_end': 2658L,
5372
-                           'selection_start': 2651L},
5373
-                          1483388285.179],
5374
-                         [loc('sources/iplayer.py'),
5375
-                          {'attrib-starts': [('Source',
5376
-        23),
5377
-        ('Source.get_streams',
5378
-         228)],
5379
-                           'first-line': 245L,
5333
+                           'selection_end': 2669L,
5334
+                           'selection_start': 2662L},
5335
+                          1483390968.266],
5336
+                         [loc('PlayStream.py'),
5337
+                          {'attrib-starts': [('MainScreen',
5338
+        324)],
5339
+                           'first-line': 327L,
5380
                            'folded-linenos': [],
5340
                            'folded-linenos': [],
5381
-                           'sel-line': 260L,
5382
-                           'sel-line-start': 13310L,
5383
-                           'selection_end': 13396L,
5384
-                           'selection_start': 13396L},
5385
-                          1483388287.071],
5341
+                           'sel-line': 343L,
5342
+                           'sel-line-start': 13445L,
5343
+                           'selection_end': 13467L,
5344
+                           'selection_start': 13464L},
5345
+                          1483390972.427],
5386
                          [loc('PlayStream.py'),
5346
                          [loc('PlayStream.py'),
5387
-                          {'attrib-starts': [('make_service',
5388
-        54)],
5389
-                           'first-line': 53L,
5347
+                          {'attrib-starts': [('MainScreen',
5348
+        324)],
5349
+                           'first-line': 327L,
5390
                            'folded-linenos': [],
5350
                            'folded-linenos': [],
5391
-                           'sel-line': 69L,
5392
-                           'sel-line-start': 2647L,
5393
-                           'selection_end': 2658L,
5394
-                           'selection_start': 2651L},
5395
-                          1483388291.054],
5396
-                         [loc('ChoiceBox.py'),
5397
-                          {'attrib-starts': [('ChoiceBox2',
5398
-        8),
5399
-        ('ChoiceBox2.__init__',
5400
-         23)],
5401
-                           'first-line': 0L,
5351
+                           'sel-line': 343L,
5352
+                           'sel-line-start': 13445L,
5353
+                           'selection_end': 13553L,
5354
+                           'selection_start': 13550L},
5355
+                          1483390973.298],
5356
+                         [loc('PlayStream.py'),
5357
+                          {'attrib-starts': [('MainScreen',
5358
+        324)],
5359
+                           'first-line': 333L,
5402
                            'folded-linenos': [],
5360
                            'folded-linenos': [],
5403
-                           'sel-line': 44L,
5404
-                           'sel-line-start': 1664L,
5405
-                           'selection_end': 1702L,
5406
-                           'selection_start': 1694L},
5407
-                          1483388291.692],
5361
+                           'sel-line': 344L,
5362
+                           'sel-line-start': 13593L,
5363
+                           'selection_end': 13618L,
5364
+                           'selection_start': 13615L},
5365
+                          1483390973.854],
5408
                          [loc('PlayStream.py'),
5366
                          [loc('PlayStream.py'),
5409
-                          {'attrib-starts': [('make_service',
5410
-        54)],
5411
-                           'first-line': 53L,
5367
+                          {'attrib-starts': [('MainScreen',
5368
+        324),
5369
+        ('MainScreen.__init__',
5370
+         356)],
5371
+                           'first-line': 363L,
5412
                            'folded-linenos': [],
5372
                            'folded-linenos': [],
5413
-                           'sel-line': 69L,
5414
-                           'sel-line-start': 2647L,
5415
-                           'selection_end': 2658L,
5416
-                           'selection_start': 2651L},
5417
-                          1483388292.719],
5418
-                         [loc('../python/Components/GUISkin.py'),
5419
-                          {'attrib-starts': [('GUISkin',
5420
-        5),
5421
-        ('GUISkin.__init__',
5422
-         8)],
5423
-                           'first-line': 17L,
5373
+                           'sel-line': 376L,
5374
+                           'sel-line-start': 16306L,
5375
+                           'selection_end': 16351L,
5376
+                           'selection_start': 16347L},
5377
+                          1483391637.716],
5378
+                         [loc('PlayStream.py'),
5379
+                          {'attrib-starts': [('MainScreen',
5380
+        324),
5381
+        ('MainScreen.__init__',
5382
+         356)],
5383
+                           'first-line': 356L,
5424
                            'folded-linenos': [],
5384
                            'folded-linenos': [],
5425
-                           'sel-line': 9L,
5426
-                           'sel-line-start': 207L,
5427
-                           'selection_end': 235L,
5428
-                           'selection_start': 225L},
5429
-                          1483388293.429],
5385
+                           'sel-line': 361L,
5386
+                           'sel-line-start': 15492L,
5387
+                           'selection_end': 15532L,
5388
+                           'selection_start': 15528L},
5389
+                          1483391639.28],
5430
                          [loc('PlayStream.py'),
5390
                          [loc('PlayStream.py'),
5431
-                          {'attrib-starts': [('make_service',
5432
-        54)],
5433
-                           'first-line': 53L,
5391
+                          {'attrib-starts': [('MainScreen',
5392
+        324),
5393
+        ('MainScreen.__init__',
5394
+         356)],
5395
+                           'first-line': 356L,
5434
                            'folded-linenos': [],
5396
                            'folded-linenos': [],
5435
-                           'sel-line': 69L,
5436
-                           'sel-line-start': 2647L,
5437
-                           'selection_end': 2658L,
5438
-                           'selection_start': 2651L},
5439
-                          1483388294.906],
5440
-                         [loc('sniplets.py'),
5441
-                          {'attrib-starts': [],
5442
-                           'first-line': 0L,
5397
+                           'sel-line': 362L,
5398
+                           'sel-line-start': 15536L,
5399
+                           'selection_end': 15546L,
5400
+                           'selection_start': 15545L},
5401
+                          1483391639.829],
5402
+                         [loc('PlayStream.py'),
5403
+                          {'attrib-starts': [('MainScreen',
5404
+        324),
5405
+        ('MainScreen.__init__',
5406
+         356)],
5407
+                           'first-line': 356L,
5443
                            'folded-linenos': [],
5408
                            'folded-linenos': [],
5444
-                           'sel-line': 1L,
5445
-                           'sel-line-start': 28L,
5446
-                           'selection_end': 82L,
5447
-                           'selection_start': 51L},
5448
-                          1483388301.472],
5409
+                           'sel-line': 365L,
5410
+                           'sel-line-start': 15676L,
5411
+                           'selection_end': 15696L,
5412
+                           'selection_start': 15694L},
5413
+                          1483391640.578],
5449
                          [loc('PlayStream.py'),
5414
                          [loc('PlayStream.py'),
5450
-                          {'attrib-starts': [('make_service',
5451
-        54)],
5452
-                           'first-line': 53L,
5415
+                          {'attrib-starts': [('MainScreen',
5416
+        324),
5417
+        ('MainScreen.__init__',
5418
+         356)],
5419
+                           'first-line': 356L,
5453
                            'folded-linenos': [],
5420
                            'folded-linenos': [],
5454
-                           'sel-line': 69L,
5455
-                           'sel-line-start': 2647L,
5456
-                           'selection_end': 2658L,
5457
-                           'selection_start': 2651L},
5458
-                          1483388306.279],
5421
+                           'sel-line': 365L,
5422
+                           'sel-line-start': 15676L,
5423
+                           'selection_end': 15697L,
5424
+                           'selection_start': 15694L},
5425
+                          1483391641.094],
5426
+                         [loc('PlayStream.py'),
5427
+                          {'attrib-starts': [('MainScreen',
5428
+        324)],
5429
+                           'first-line': 335L,
5430
+                           'folded-linenos': [],
5431
+                           'sel-line': 352L,
5432
+                           'sel-line-start': 15077L,
5433
+                           'selection_end': 15122L,
5434
+                           'selection_start': 15122L},
5435
+                          1483397133.215],
5459
                          [loc('ContentSources.py'),
5436
                          [loc('ContentSources.py'),
5460
                           {'attrib-starts': [('ContentSources',
5437
                           {'attrib-starts': [('ContentSources',
5461
         15),
5438
         15),
5467
                            'sel-line-start': 3910L,
5444
                            'sel-line-start': 3910L,
5468
                            'selection_end': 3925L,
5445
                            'selection_end': 3925L,
5469
                            'selection_start': 3925L},
5446
                            'selection_start': 3925L},
5470
-                          1483388348.357],
5447
+                          1483397166.213],
5471
                          [loc('sources/filmix.py'),
5448
                          [loc('sources/filmix.py'),
5472
-                          {'attrib-starts': [],
5473
-                           'first-line': 17L,
5449
+                          {'attrib-starts': [('Source',
5450
+        24),
5451
+        ('Source.get_content',
5452
+         49)],
5453
+                           'first-line': 88L,
5474
                            'folded-linenos': [],
5454
                            'folded-linenos': [],
5475
-                           'sel-line': 22L,
5476
-                           'sel-line-start': 622L,
5477
-                           'selection_end': 622L,
5478
-                           'selection_start': 622L},
5479
-                          1483388877.819],
5455
+                           'sel-line': 113L,
5456
+                           'sel-line-start': 4479L,
5457
+                           'selection_end': 4479L,
5458
+                           'selection_start': 4479L},
5459
+                          1483468572.85],
5480
                          [loc('ContentSources.py'),
5460
                          [loc('ContentSources.py'),
5481
-                          {'attrib-starts': [('ContentSources',
5482
-        15),
5483
-        ('ContentSources.get_streams',
5484
-         74)],
5485
-                           'first-line': 0L,
5461
+                          {'attrib-starts': [],
5462
+                           'first-line': 133L,
5486
                            'folded-linenos': [],
5463
                            'folded-linenos': [],
5487
-                           'sel-line': 96L,
5488
-                           'sel-line-start': 3910L,
5489
-                           'selection_end': 3925L,
5490
-                           'selection_start': 3925L},
5491
-                          1483388887.61],
5492
-                         [loc('sources/filmix.py'),
5464
+                           'sel-line': 150L,
5465
+                           'sel-line-start': 5363L,
5466
+                           'selection_end': 5363L,
5467
+                           'selection_start': 5363L},
5468
+                          1483469182.966],
5469
+                         [loc('sources/ltc.py'),
5470
+                          {'attrib-starts': [],
5471
+                           'first-line': 11L,
5472
+                           'folded-linenos': [],
5473
+                           'sel-line': 16L,
5474
+                           'sel-line-start': 552L,
5475
+                           'selection_end': 552L,
5476
+                           'selection_start': 552L},
5477
+                          1483469582.584],
5478
+                         [loc('ContentSources.py'),
5493
                           {'attrib-starts': [],
5479
                           {'attrib-starts': [],
5494
-                           'first-line': 17L,
5480
+                           'first-line': 133L,
5481
+                           'folded-linenos': [],
5482
+                           'sel-line': 150L,
5483
+                           'sel-line-start': 5363L,
5484
+                           'selection_end': 5363L,
5485
+                           'selection_start': 5363L},
5486
+                          1483470729.597],
5487
+                         [loc('sources/ltc.py'),
5488
+                          {'attrib-starts': [('Source',
5489
+        24),
5490
+        ('Source.get_content',
5491
+         71)],
5492
+                           'first-line': 67L,
5495
                            'folded-linenos': [],
5493
                            'folded-linenos': [],
5496
-                           'sel-line': 22L,
5497
-                           'sel-line-start': 622L,
5498
-                           'selection_end': 622L,
5499
-                           'selection_start': 622L},
5500
-                          1483389381.844]],
5494
+                           'sel-line': 72L,
5495
+                           'sel-line-start': 2705L,
5496
+                           'selection_end': 2705L,
5497
+                           'selection_start': 2705L},
5498
+                          1483470974.796]],
5501
                         20),
5499
                         20),
5502
           'current-loc': loc('ContentSources.py'),
5500
           'current-loc': loc('ContentSources.py'),
5503
           'editor-state-list': [(loc('plugin.py'),
5501
           'editor-state-list': [(loc('plugin.py'),
5510
                                   'selection_end': 208,
5508
                                   'selection_end': 208,
5511
                                   'selection_start': 199}),
5509
                                   'selection_start': 199}),
5512
                                 (loc('PlayStream.py'),
5510
                                 (loc('PlayStream.py'),
5513
-                                 {'attrib-starts': [('make_service',
5514
-        54)],
5515
-                                  'first-line': 53L,
5511
+                                 {'attrib-starts': [('MainScreen',
5512
+        324)],
5513
+                                  'first-line': 335L,
5516
                                   'folded-linenos': [],
5514
                                   'folded-linenos': [],
5517
-                                  'sel-line': 69L,
5518
-                                  'sel-line-start': 2647L,
5519
-                                  'selection_end': 2658L,
5520
-                                  'selection_start': 2651L}),
5515
+                                  'sel-line': 352L,
5516
+                                  'sel-line-start': 15077L,
5517
+                                  'selection_end': 15122L,
5518
+                                  'selection_start': 15122L}),
5521
                                 (loc('util.py'),
5519
                                 (loc('util.py'),
5522
                                  {'attrib-starts': [('play_video',
5520
                                  {'attrib-starts': [('play_video',
5523
         49)],
5521
         49)],
5524
-                                  'first-line': 67,
5522
+                                  'first-line': 67L,
5525
                                   'folded-linenos': [],
5523
                                   'folded-linenos': [],
5526
-                                  'sel-line': 84,
5527
-                                  'sel-line-start': 2507,
5528
-                                  'selection_end': 2507,
5529
-                                  'selection_start': 2507}),
5524
+                                  'sel-line': 84L,
5525
+                                  'sel-line-start': 2507L,
5526
+                                  'selection_end': 2507L,
5527
+                                  'selection_start': 2507L}),
5530
                                 (loc('ContentSources.py'),
5528
                                 (loc('ContentSources.py'),
5531
-                                 {'attrib-starts': [('ContentSources',
5532
-        15),
5533
-        ('ContentSources.get_streams',
5534
-         74)],
5535
-                                  'first-line': 0L,
5529
+                                 {'attrib-starts': [],
5530
+                                  'first-line': 133L,
5536
                                   'folded-linenos': [],
5531
                                   'folded-linenos': [],
5537
-                                  'sel-line': 96L,
5538
-                                  'sel-line-start': 3910L,
5539
-                                  'selection_end': 3925L,
5540
-                                  'selection_start': 3925L}),
5532
+                                  'sel-line': 150L,
5533
+                                  'sel-line-start': 5363L,
5534
+                                  'selection_end': 5363L,
5535
+                                  'selection_start': 5363L}),
5541
                                 (loc('sources/kinofilmnet.py'),
5536
                                 (loc('sources/kinofilmnet.py'),
5542
                                  {'attrib-starts': [('Source',
5537
                                  {'attrib-starts': [('Source',
5543
         23),
5538
         23),
5554
         24),
5549
         24),
5555
         ('Source.get_content',
5550
         ('Source.get_content',
5556
          71)],
5551
          71)],
5557
-                                  'first-line': 67,
5552
+                                  'first-line': 67L,
5558
                                   'folded-linenos': [],
5553
                                   'folded-linenos': [],
5559
-                                  'sel-line': 72,
5560
-                                  'sel-line-start': 2705,
5561
-                                  'selection_end': 2705,
5562
-                                  'selection_start': 2705}),
5554
+                                  'sel-line': 72L,
5555
+                                  'sel-line-start': 2705L,
5556
+                                  'selection_end': 2705L,
5557
+                                  'selection_start': 2705L}),
5563
                                 (loc('resolvers/hdgo.py'),
5558
                                 (loc('resolvers/hdgo.py'),
5564
                                  {'attrib-starts': [('supports',
5559
                                  {'attrib-starts': [('supports',
5565
         37)],
5560
         37)],
5570
                                   'selection_end': 1163,
5565
                                   'selection_end': 1163,
5571
                                   'selection_start': 1163}),
5566
                                   'selection_start': 1163}),
5572
                                 (loc('sources/filmix.py'),
5567
                                 (loc('sources/filmix.py'),
5573
-                                 {'attrib-starts': [],
5574
-                                  'first-line': 17L,
5568
+                                 {'attrib-starts': [('Source',
5569
+        24),
5570
+        ('Source.get_content',
5571
+         49)],
5572
+                                  'first-line': 88L,
5575
                                   'folded-linenos': [],
5573
                                   'folded-linenos': [],
5576
-                                  'sel-line': 22L,
5577
-                                  'sel-line-start': 622L,
5578
-                                  'selection_end': 622L,
5579
-                                  'selection_start': 622L}),
5574
+                                  'sel-line': 113L,
5575
+                                  'sel-line-start': 4479L,
5576
+                                  'selection_end': 4479L,
5577
+                                  'selection_start': 4479L}),
5580
                                 (loc('sources/replay.py'),
5578
                                 (loc('sources/replay.py'),
5581
                                  {'attrib-starts': [('Source',
5579
                                  {'attrib-starts': [('Source',
5582
         25),
5580
         25),
5919
                                 (loc('util.py'),
5917
                                 (loc('util.py'),
5920
                                  {'attrib-starts': [('player',
5918
                                  {'attrib-starts': [('player',
5921
         86)],
5919
         86)],
5922
-                                  'first-line': 89,
5920
+                                  'first-line': 89L,
5923
                                   'folded-linenos': [],
5921
                                   'folded-linenos': [],
5924
-                                  'sel-line': 103,
5925
-                                  'sel-line-start': 3402,
5926
-                                  'selection_end': 3421,
5927
-                                  'selection_start': 3421}),
5922
+                                  'sel-line': 103L,
5923
+                                  'sel-line-start': 3402L,
5924
+                                  'selection_end': 3421L,
5925
+                                  'selection_start': 3421L}),
5928
                                 (loc('sources/replay.py'),
5926
                                 (loc('sources/replay.py'),
5929
                                  {'attrib-starts': [('Source',
5927
                                  {'attrib-starts': [('Source',
5930
         25),
5928
         25),
5948
           loc('sources/ustvnow.py'),
5946
           loc('sources/ustvnow.py'),
5949
           loc('util.py'),
5947
           loc('util.py'),
5950
           loc('sources/replay.py')])),
5948
           loc('sources/replay.py')])),
5951
-                               'open_files': [u'plugin.py',
5949
+                               'open_files': [u'PlayStream.py',
5950
+        u'plugin.py',
5952
         u'resolvers/hdgo.py',
5951
         u'resolvers/hdgo.py',
5953
         u'sources/kinofilmnet.py',
5952
         u'sources/kinofilmnet.py',
5954
-        u'sources/ltc.py',
5955
         u'sources/replay.py',
5953
         u'sources/replay.py',
5956
         u'sources/ustvnow.py',
5954
         u'sources/ustvnow.py',
5957
         u'util.py',
5955
         u'util.py',
5958
-        u'PlayStream.py',
5959
         u'sources/filmix.py',
5956
         u'sources/filmix.py',
5957
+        u'sources/ltc.py',
5960
         u'ContentSources.py']},
5958
         u'ContentSources.py']},
5961
         'saved_notebook_display': None,
5959
         'saved_notebook_display': None,
5962
         'split_percents': {0: 0.33756345177664976},
5960
         'split_percents': {0: 0.33756345177664976},
5973
                          2405,
5971
                          2405,
5974
                          1376)}]}
5972
                          1376)}]}
5975
 guimgr.recent-documents = [loc('ContentSources.py'),
5973
 guimgr.recent-documents = [loc('ContentSources.py'),
5976
-                           loc('sources/filmix.py'),
5974
+                           loc('sources/ltc.py'),
5977
                            loc('PlayStream.py'),
5975
                            loc('PlayStream.py'),
5978
                            loc('util.py'),
5976
                            loc('util.py'),
5977
+                           loc('sources/filmix.py'),
5979
                            loc('sources/ustvnow.py'),
5978
                            loc('sources/ustvnow.py'),
5980
                            loc('sources/kinofilmnet.py'),
5979
                            loc('sources/kinofilmnet.py'),
5981
                            loc('sources/replay.py'),
5980
                            loc('sources/replay.py'),
5982
-                           loc('sources/ltc.py'),
5983
                            loc('resolvers/hdgo.py'),
5981
                            loc('resolvers/hdgo.py'),
5984
                            loc('plugin.py')]
5982
                            loc('plugin.py')]
5985
 guimgr.visual-state = {loc('../../Kodi/test2/plugin.video.aaa/addon.py'): {'a'\
5983
 guimgr.visual-state = {loc('../../Kodi/test2/plugin.video.aaa/addon.py'): {'a'\
6673
         'sel-line-start': 4043,
6671
         'sel-line-start': 4043,
6674
         'selection_end': 4043,
6672
         'selection_end': 4043,
6675
         'selection_start': 4043},
6673
         'selection_start': 4043},
6676
-                       loc('../python/Components/GUISkin.py'): {'attrib-star'\
6677
-        'ts': [],
6678
-        'first-line': 0L,
6679
-        'folded-linenos': [],
6680
-        'sel-line': 0L,
6681
-        'sel-line-start': 0L,
6682
-        'selection_end': 0L,
6683
-        'selection_start': 0L},
6684
                        loc('../../../../Python27/Lib/site-packages/gi/overrides/Gst.py'): {'a'\
6674
                        loc('../../../../Python27/Lib/site-packages/gi/overrides/Gst.py'): {'a'\
6685
         'ttrib-starts': [],
6675
         'ttrib-starts': [],
6686
         'first-line': 0,
6676
         'first-line': 0,
6689
         'sel-line-start': 0,
6679
         'sel-line-start': 0,
6690
         'selection_end': 0,
6680
         'selection_end': 0,
6691
         'selection_start': 0},
6681
         'selection_start': 0},
6692
-                       loc('../../../../Python27/Lib/re.py'): {'attrib-start'\
6693
-        's': [('findall',
6694
-               172)],
6695
-        'first-line': 162,
6682
+                       loc('../python/Components/GUISkin.py'): {'attrib-star'\
6683
+        'ts': [],
6684
+        'first-line': 0L,
6696
         'folded-linenos': [],
6685
         'folded-linenos': [],
6697
-        'sel-line': 180,
6698
-        'sel-line-start': 8708,
6699
-        'selection_end': 8708,
6700
-        'selection_start': 8708},
6686
+        'sel-line': 0L,
6687
+        'sel-line-start': 0L,
6688
+        'selection_end': 0L,
6689
+        'selection_start': 0L},
6701
                        loc('../../../../Python27/lib/BaseHTTPServer.py'): {'a'\
6690
                        loc('../../../../Python27/lib/BaseHTTPServer.py'): {'a'\
6702
         'ttrib-starts': [('BaseHTTPRequestHandler',
6691
         'ttrib-starts': [('BaseHTTPRequestHandler',
6703
                           113),
6692
                           113),
6718
         'sel-line-start': 2478,
6707
         'sel-line-start': 2478,
6719
         'selection_end': 2478,
6708
         'selection_end': 2478,
6720
         'selection_start': 2478},
6709
         'selection_start': 2478},
6710
+                       loc('../../../../Python27/lib/re.py'): {'attrib-start'\
6711
+        's': [('findall',
6712
+               172)],
6713
+        'first-line': 162,
6714
+        'folded-linenos': [],
6715
+        'sel-line': 180,
6716
+        'sel-line-start': 8708,
6717
+        'selection_end': 8708,
6718
+        'selection_start': 8708},
6721
                        loc('../../../../Python27/lib/site-packages/gi/__init__.py'): {'a'\
6719
                        loc('../../../../Python27/lib/site-packages/gi/__init__.py'): {'a'\
6722
         'ttrib-starts': [],
6720
         'ttrib-starts': [],
6723
         'first-line': 24,
6721
         'first-line': 24,
6782
                        u''])}
6780
                        u''])}
6783
 search.replace-history = [u'self',
6781
 search.replace-history = [u'self',
6784
                           u'current']
6782
                           u'current']
6785
-search.search-history = [u'eServiceReference',
6783
+search.search-history = [u'red',
6784
+                         u'eServiceReference',
6786
                          u'service',
6785
                          u'service',
6787
                          u'gst',
6786
                          u'gst',
6788
                          u'timer',
6787
                          u'timer',
6800
                          u'List',
6799
                          u'List',
6801
                          u'ChoiceList',
6800
                          u'ChoiceList',
6802
                          u'choiceli',
6801
                          u'choiceli',
6803
-                         u'ChoiceEntryComponent',
6804
-                         u'list']
6802
+                         u'ChoiceEntryComponent']
6805
 testing.stored-results = (1,
6803
 testing.stored-results = (1,
6806
                           [],
6804
                           [],
6807
                           {})
6805
                           {})

+ 6
- 1
changelog.md View File

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

BIN
release/enigma2-plugin-extensions-playstream_0.5l.ipk View File