Merge branch 'master' of https://github.com/kodiondemand/addon

addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.kod" name="Kodi on Demand BETA" version="1.1" provider-name="KoD Team">
+<addon id="plugin.video.kod" name="Kodi on Demand BETA" version="1.2" provider-name="KoD Team">
   <requires>
     <!-- <import addon="script.module.libtorrent" optional="true"/> -->
     <import addon="metadata.themoviedb.org"/>
@@ -19,9 +19,11 @@
       <screenshot>resources/media/themes/ss/2.png</screenshot>
       <screenshot>resources/media/themes/ss/3.png</screenshot>
     </assets>
-      <news> - Ottimizzata e migliorata la ricerca globale
+      <news> - aggiunto nuovo canale: guardaserie.cam
-      - fix Mega
+- autoplay migliorato, ora i settaggi sono globali e non più per canale
-    - altri cambiamenti minori</news>
+- adesso in onda riscritto, ora usa EPG (ringraziamo epg-guide.com)
+- Riprendi la visione di un film o episodio da server diversi (solo videoteca)
+- fix e ottimizzazioni varie</news>
     <description lang="it">Naviga velocemente sul web e guarda i contenuti presenti</description>
     <disclaimer>[COLOR red]The owners and submitters to this addon do not host or distribute any of the content displayed by these addons nor do they have any affiliation with the content providers.[/COLOR]
     [COLOR yellow]Kodi © is a registered trademark of the XBMC Foundation. We are not connected to or in any other way affiliated with Kodi, Team Kodi, or the XBMC Foundation. Furthermore, any software, addons, or products offered by us will receive no support in official Kodi channels, including the Kodi forums and various social networks.[/COLOR]</disclaimer>

channels/guardaserieIcu.json

@@ -2,7 +2,7 @@
     "id": "guardaserieIcu",
     "name": "Guarda Serie Icu",
     "language": ["ita", "sub-ita"],
-    "active": true,
+    "active": false,
     "thumbnail": "https://raw.githubusercontent.com/32Dexter/DexterRepo/master/media/guarda_serie.jpg",
     "banner": "",
     "categories": ["tvshow"],

channels/mediasetplay.json

@@ -1,7 +1,7 @@
 {
     "id": "mediasetplay",
     "name": "Mediaset Play",
-    "active": true,
+    "active": false,
     "language": ["ita"],
     "thumbnail": "mediasetplay.png",
     "banner": "mediasetplay.png",

resources/settings.xml

@@ -163,7 +163,7 @@
         <!-- <setting id="category" type="select" label="70124" lvalues="70137|30123|30124|60513" default="Film" visible="eq(-3,True)+eq(-1,True)+eq(-2,False)" enable="eq(-3,True)+eq(-1,True)+(-2,false)"/> -->
 		<!-- Others -->
         <setting label="70149" type="lsep"/>
-        <setting id="icon_set" type="select" label="70108" values="default|light|dark" default="default"/>
+        <setting id="icon_set" type="select" label="70108" values="default|light|dark|mike" default="default"/>
         <setting id="only_channel_icons" type="bool" label="30009" default="false"/>
         <setting id="enable_custom_theme" type="bool" label="70564" default="false"/>
         <setting id="custom_theme" type="folder" label="70565" default="" visible="eq(-1,true)"/>

specials/filmontv.py

@@ -309,7 +309,7 @@ def new_search(item):
 
 def live(item):
     itemlist = []
-    from channels import raiplay, mediasetplay
+    from channels import raiplay#, mediasetplay
     itemlist += raiplay.live(raiplay.mainlist(Item())[0])
-    itemlist += mediasetplay.live(mediasetplay.mainlist(Item())[0])
+    # itemlist += mediasetplay.live(mediasetplay.mainlist(Item())[0])
     return itemlist