v.0.5.6b

addons.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addons>
-<addon id="plugin.video.pseudotv.live" version="0.5.6a" name="PseudoTV Live" provider-name="Lunatixz">
+<addon id="plugin.video.pseudotv.live" version="0.5.6b" name="PseudoTV Live" provider-name="Lunatixz">
     <requires>
         <import addon="xbmc.python" version="3.0.1"/>
         <import addon="pvr.iptvsimple" version="21.8.0"/>

addons.xml.md5

@@ -1 +1 @@
-5ec6e6d6294a87bb7069f710fc823b41
+3954751fb598d2f69a4eee98e4ed9569

plugin.video.pseudotv.live/addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="plugin.video.pseudotv.live" version="0.5.6a" name="PseudoTV Live" provider-name="Lunatixz">
+<addon id="plugin.video.pseudotv.live" version="0.5.6b" name="PseudoTV Live" provider-name="Lunatixz">
     <requires>
         <import addon="xbmc.python" version="3.0.1"/>
         <import addon="pvr.iptvsimple" version="21.8.0"/>

plugin.video.pseudotv.live/changelog.txt

@@ -1,4 +1,10 @@
+v.0.5.7
+-Improved Overlay position utility to include On-Next position and in the near future vignette position.
+ - Added "Global" option for On-Next position, Including Adv. channel rules.
+ - Added "Global" option for On-Next color change, Including Adv. channel rules.
+
 v.0.5.6
+-Improved Vignette (W.I.P) available in Adv. Channel Rules.
 -Added Global Interleaving value and Advanced Interleaving Channel rule. 
 -Improved Even Distribution, now includes "Force Episode Ordering".
 -Improved Channel Bug position tool, now includes overlay vignette if applicable.
@@ -7,8 +13,6 @@ v.0.5.6
 -Added Pre-Roll/Post-Roll options to Adv. Channel rules.
 -Improved Advanced Channel rules.
 -Fixed Overlay issues introduced in previous versions.
--Improved Vignette (W.I.P):
- -Global settings added for default vignette image, zoom. Per-Channel settings available in Advanced Channel Rules.
 -Improved MediaInfo support for external mediainfo.xml file parsing.
 -Fixed Issue with disappearing channels from m3u.
 -Tweaked Background overlay.

plugin.video.pseudotv.live/resources/language/resource.language.en_gb/strings.po

@@ -238,7 +238,7 @@ msgid "Include STRMs"
 msgstr ""
 
 msgctxt "#30055"
-msgid "Include 3D Media."
+msgid "Include 3D Media"
 msgstr ""
 
 msgctxt "#30056"
@@ -734,7 +734,7 @@ msgid "Vignette Rules"
 msgstr ""
 
 msgctxt "#30178"
-msgid "Vignette Offset"
+msgid "Vignette V-Shift"
 msgstr ""
 
 msgctxt "#30179"
@@ -761,6 +761,13 @@ msgctxt "#30184"
 msgid "Enabled"
 msgstr ""
 
+msgctxt "#30185"
+msgid "Vignette Pixel Ratio"
+msgstr ""
+
+msgctxt "#30186"
+msgid "Vignette Non-Linear Stretch"
+msgstr ""
 
 # Skin - strings 31000 thru 31999 reserved for skins
 
@@ -1152,7 +1159,7 @@ msgid "Channel Rules"
 msgstr ""
 
 msgctxt "#32096"
-msgid "Position Changed, Do you want to save?\n(%s,%s)"
+msgid "Position Changed, Do you want to save?"
 msgstr ""
 
 msgctxt "#32097"
@@ -1675,6 +1682,11 @@ msgctxt "#32228"
 msgid "Hide Screen Vignette"
 msgstr ""
 
+msgctxt "#32229"
+msgid "On Next Position"
+msgstr ""
+
+
 # Help - strings 33000 thru 33999 reserved for common strings used in add-ons
 
 msgctxt "#33001"
@@ -1770,11 +1782,11 @@ msgid "Display the channel logo at the bottom corner of your screen."
 msgstr ""
 
 msgctxt "#33044"
-msgid "Select Color to apply to monochromatic channel logos [#FFFFFFFF Default]"
+msgid "Select Color to apply [#FFFFFFFF Default]"
 msgstr ""
 
 msgctxt "#33045"
-msgid "Display On-Next information towards the end of programme.\nIf Playlist Playback & Up-Next service installed; support meta is provided."
+msgid "Display On Next information towards the end of programme.\nIf Playlist Playback & Up-Next service installed; support meta is provided."
 msgstr ""
 
 msgctxt "#33046"
@@ -1802,7 +1814,7 @@ msgid "Include .strm files *see wiki for details."
 msgstr ""
 
 msgctxt "#33055"
-msgid "Include 3D Media."
+msgid "Include 3D Media"
 msgstr ""
 
 msgctxt "#33056"
@@ -2042,7 +2054,7 @@ msgid "Select Vignette Image"
 msgstr ""
 
 msgctxt "#33179"
-msgid "Change Vignette Offset"
+msgid "Change Vignette V-Shift"
 msgstr ""
 
 msgctxt "#33180"
@@ -2057,6 +2069,14 @@ msgctxt "#33182"
 msgid "Enabled in discovered servers in the list below."
 msgstr ""
 
+msgctxt "#33185"
+msgid "Vignette Pixel Ratio"
+msgstr ""
+
+msgctxt "#33186"
+msgid "Vignette Non-Linear Stretch"
+msgstr ""
+
 msgctxt "#33202"
 msgid "Minimum Debugging Level [LOGERROR - Default]"
 msgstr ""
@@ -2077,6 +2097,10 @@ msgctxt "#33215"
 msgid "Interleave individual paths in sets of x *see wiki for details [0 Disabled, 1 Default]"
 msgstr ""
 
+msgctxt "#33229"
+msgid "Change the onscreen On Next position. [Auto Default]"
+msgstr ""
+
 msgctxt "#33308"
 msgid "Install Log Uploader."
 msgstr ""

plugin.video.pseudotv.live/resources/lib/constants.py

@@ -41,7 +41,7 @@
 #constants
 FIFTEEN             = 15    #unit
 DISCOVERY_TIMER     = 60    #secs
-SUSPEND_TIMER       = 5     #secs
+SUSPEND_TIMER       = 30    #secs
 DISCOVER_INTERVAL   = 30    #secs
 EPG_DURATION        = 10800 #secs
 DTFORMAT            = '%Y%m%d%H%M%S'
@@ -219,7 +219,7 @@
 RESTART_XML    = '%s.restart.xml'%(ADDON_ID)
 BACKGROUND_XML = '%s.background.xml'%(ADDON_ID)
 MANAGER_XML    = '%s.manager.xml'%(ADDON_ID)
-CHANNELBUG_XML = '%s.channelbug.xml'%(ADDON_ID)
+OVERLAYTOOL_XML = '%s.overlaytool.xml'%(ADDON_ID)
 
 # https://github.com/xbmc/xbmc/blob/master/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/input/action_ids.h
 

plugin.video.pseudotv.live/resources/lib/jsonrpc.py

@@ -267,13 +267,13 @@ def getFileDetails(self, file, media='video', properties=["duration","runtime"])
         return self.sendJSON({"method":"Files.GetFileDetails","params":{"file":file,"media":media,"properties":properties}})
 
 
-    def getPlayerAttr(self, attr='zoom'):
+    def getViewMode(self):
         #{"nonlinearstretch":false,"pixelratio":1,"verticalshift":0,"viewmode":"custom","zoom": 1.0}
-        return self.sendJSON({"method":"Player.GetViewMode","params":{}}).get(attr)
-
+        return self.sendJSON({"method":"Player.GetViewMode","params":{}})
+        
 
-    def setPlayerZoom(self, zoom=1.0):
-        return self.sendJSON({"method":"Player.SetViewMode","params":{"viewmode":{"zoom":zoom}}})
+    def setViewMode(self, params={}):
+        return self.sendJSON({"method":"Player.SetViewMode","params":params})
 
 
     def getPlayerItem(self, playlist=False):
@@ -358,24 +358,24 @@ def __parseDuration(self, runtime, path, item={}, save=SETTINGS.getSettingBool('
 
 
     def queDuration(self, item={}, duration=0, runtime=0):
-        param = {'video'      : {},
-                 'movie'      : {"method":"VideoLibrary.SetMovieDetails"     ,"params":{"movieid"     :item.get('id',-1)           ,"runtime": runtime,"resume": {"position": item.get('position',0.0),"total": duration}}},
-                 'movies'     : {"method":"VideoLibrary.SetMovieDetails"     ,"params":{"movieid"     :item.get('movieid',-1)      ,"runtime": runtime,"resume": {"position": item.get('position',0.0),"total": duration}}},
-                 'episode'    : {"method":"VideoLibrary.SetEpisodeDetails"   ,"params":{"episodeid"   :item.get('id',-1)           ,"runtime": runtime,"resume": {"position": item.get('position',0.0),"total": duration}}},
-                 'episodes'   : {"method":"VideoLibrary.SetEpisodeDetails"   ,"params":{"episodeid"   :item.get('episodeid',-1)    ,"runtime": runtime,"resume": {"position": item.get('position',0.0),"total": duration}}},
-                 'musicvideo' : {"method":"VideoLibrary.SetMusicVideoDetails","params":{"musicvideoid":item.get('id',-1)           ,"runtime": runtime,"resume": {"position": item.get('position',0.0),"total": duration}}},
-                 'musicvideos': {"method":"VideoLibrary.SetMusicVideoDetails","params":{"musicvideoid":item.get('musicvideoid',-1) ,"runtime": runtime,"resume": {"position": item.get('position',0.0),"total": duration}}},
-                 'song'       : {"method":"AudioLibrary.SetSongDetails"      ,"params":{"songid"      :item.get('id',-1)           ,"runtime": runtime,"resume": {"position": item.get('position',0.0),"total": duration}}},
-                 'songs'      : {"method":"AudioLibrary.SetSongDetails"      ,"params":{"songid"      :item.get('songid',-1)       ,"runtime": runtime,"resume": {"position": item.get('position',0.0),"total": duration}}}}
+        mtypes = {'video'      : {},
+                  'movie'      : {"method":"VideoLibrary.SetMovieDetails"     ,"params":{"movieid"     :item.get('id',-1)           ,"runtime": runtime,"resume": {"position": item.get('position',0.0),"total": duration}}},
+                  'movies'     : {"method":"VideoLibrary.SetMovieDetails"     ,"params":{"movieid"     :item.get('movieid',-1)      ,"runtime": runtime,"resume": {"position": item.get('position',0.0),"total": duration}}},
+                  'episode'    : {"method":"VideoLibrary.SetEpisodeDetails"   ,"params":{"episodeid"   :item.get('id',-1)           ,"runtime": runtime,"resume": {"position": item.get('position',0.0),"total": duration}}},
+                  'episodes'   : {"method":"VideoLibrary.SetEpisodeDetails"   ,"params":{"episodeid"   :item.get('episodeid',-1)    ,"runtime": runtime,"resume": {"position": item.get('position',0.0),"total": duration}}},
+                  'musicvideo' : {"method":"VideoLibrary.SetMusicVideoDetails","params":{"musicvideoid":item.get('id',-1)           ,"runtime": runtime,"resume": {"position": item.get('position',0.0),"total": duration}}},
+                  'musicvideos': {"method":"VideoLibrary.SetMusicVideoDetails","params":{"musicvideoid":item.get('musicvideoid',-1) ,"runtime": runtime,"resume": {"position": item.get('position',0.0),"total": duration}}},
+                  'song'       : {"method":"AudioLibrary.SetSongDetails"      ,"params":{"songid"      :item.get('id',-1)           ,"runtime": runtime,"resume": {"position": item.get('position',0.0),"total": duration}}},
+                  'songs'      : {"method":"AudioLibrary.SetSongDetails"      ,"params":{"songid"      :item.get('songid',-1)       ,"runtime": runtime,"resume": {"position": item.get('position',0.0),"total": duration}}}}
         try:
-            params = param.get(item.get('type'))
-            if params and params.get('params'):
-                if   duration == 0: param['params'].pop('resume')
-                elif runtime  == 0: param['params'].pop('runtime')
+            mtype = mtypes.get(item.get('type'))
+            if mtype.get('params'):
+                if   duration == 0: mtype['params'].pop('resume')  #save file duration meta
+                elif runtime  == 0: mtype['params'].pop('runtime') #save player runtime meta
                 id = (item.get('id') or item.get('movieid') or item.get('episodeid') or item.get('musicvideoid') or item.get('songid'))
                 self.log('queDuration, id = %s, media = %s, duration = %s, runtime = %s'%(id,item['type'],duration,runtime))
-                self.queueJSON(params)
-        except Exception as e: self.log("queDuration, failed! %s\nitem = %s"%(e,item), xbmc.LOGERROR)
+                self.queueJSON(mtype['params'])
+        except Exception as e: self.log("queDuration, failed! %s\nmtype = %s\nitem = %s"%(e,mtype,item), xbmc.LOGERROR)
 
 
     def quePlaycount(self, item):

plugin.video.pseudotv.live/resources/lib/manager.py

@@ -363,7 +363,7 @@ def getLogoColor(self, citem):
         elif citem.get('rules',{}).get("1"):
             if (self.getRuleAbbr(citem,1,4) or self.resources.isMono(citem['logo'])):
                 return self.getRuleAbbr(citem,1,3)
-        return SETTINGS.getSetting('DIFFUSE_LOGO')
+        return SETTINGS.getSetting('ChannelBug_Color')
 
 
     def getRuleAbbr(self, citem, myId, optionindex):

plugin.video.pseudotv.live/resources/lib/multiroom.py

@@ -63,7 +63,7 @@ def __chkSettings(settings):
         PROPERTIES.setServers(len(servers) > 0)
         for server in list(servers.values()):
             online = server.get('online',False)
-            if self.getRemote(server['remotes'].get('bonjour')): server['online'] = True
+            if self.getRemote(server.get('remotes',{}).get('bonjour')): server['online'] = True
             else:                                                server['online'] = False
             if server.get('enabled',False):
                 if online != server.get('online',False): DIALOG.notificationDialog('%s: %s'%(server.get('name'),LANGUAGE(32211)%({True:'green',False:'red'}[server.get('online',False)],{True:'Online',False:'Offline'}[server.get('online',False)])))