commit

changelog.txt

@@ -1,5 +1,7 @@
 v 0.3.6
   1. fix loading acestream url with trailling '/'
+  2. added suport for playing acestream and sopcast channels by "Plexus" addon
+     "https://www.tvaddons.ag/kodi-addons/show/program.plexus/"
 
 v 0.3.5
   1. fix program guide information

default.py

@@ -342,14 +342,30 @@ def STREAM(name, iconimage, url, protocol, sch_ch_id, ch_id):
 
   #play sopcast stream
   if protocol == "sop":
-    sop = sopcast(player=player, url=url, listitem=listitem)
-    sop.start()
+    if(SETTINGS.USE_PLEXUS_SOP == 'true'):
+      try:
+        addon_log('plexus')
+        xbmc.executebuiltin('XBMC.RunPlugin(plugin://program.plexus/?mode=2&url='+url+'&name='+name+'&iconimage='+iconimage+')')
+      except Exception as inst:
+        addon_log(inst)
+        xbmc.executebuiltin("Notification(%s,%s,%i)" % (addon.getLocalizedString(30303), "", 10000))
+    else:
+      sop = sopcast(player=player, url=url, listitem=listitem)
+      sop.start()
 
   #play acestream
   elif protocol=='acestream':
-    ace = acestream(player=player, url=url, listitem=listitem)
-    ace.engine_connect()
-
+    if(SETTINGS.USE_PLEXUS_ACE == 'true'):
+      try:
+        addon_log('plexus')
+        xbmc.executebuiltin('XBMC.RunPlugin(plugin://program.plexus/?mode=1&url='+url+'&name='+name+'&iconimage='+iconimage+')')
+      except Exception as inst:
+        addon_log(inst)
+        xbmc.executebuiltin("Notification(%s,%s,%i)" % (addon.getLocalizedString(30303), "", 10000))
+    else:
+      ace = acestream(player=player, url=url, listitem=listitem)
+      ace.engine_connect()
+
   #play direct stream
   else:
     try:

resources/language/English/strings.po

@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: XBMC-Addons\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2016-05-03 09:59+0000\n"
+"POT-Creation-Date: 2016-06-02 11:19+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE\n"
@@ -109,7 +109,11 @@ msgctxt "#30026"
 msgid "Show unverified"
 msgstr ""
 
-#empty strings from id 30027 to 30049
+msgctxt "#30027"
+msgid "Use Plexus"
+msgstr ""
+
+#empty strings from id 30028 to 30049
 
 msgctxt "#30050"
 msgid "Refresh Schedule"
@@ -179,131 +183,7 @@ msgctxt "#30066"
 msgid "unverified"
 msgstr ""
 
-#empty strings from id 30067 to 30099
-
-msgctxt "#30100"
-msgid "AUSTRIA"
-msgstr ""
-
-msgctxt "#30101"
-msgid "CZECH REPUBLIC"
-msgstr ""
-
-msgctxt "#30102"
-msgid "FRANCE"
-msgstr ""
-
-msgctxt "#30103"
-msgid "GERMANY"
-msgstr ""
-
-msgctxt "#30104"
-msgid "INDIA"
-msgstr ""
-
-msgctxt "#30105"
-msgid "ITALY"
-msgstr ""
-
-msgctxt "#30106"
-msgid "MOLDOVA"
-msgstr ""
-
-msgctxt "#30107"
-msgid "POLAND"
-msgstr ""
-
-msgctxt "#30108"
-msgid "PORTUGAL"
-msgstr ""
-
-msgctxt "#30109"
-msgid "ROMANIA"
-msgstr ""
-
-msgctxt "#30110"
-msgid "RUSSIAN FEDERATION"
-msgstr ""
-
-msgctxt "#30111"
-msgid "SERBIA"
-msgstr ""
-
-msgctxt "#30112"
-msgid "SPAIN"
-msgstr ""
-
-msgctxt "#30113"
-msgid "TURKEY"
-msgstr ""
-
-msgctxt "#30114"
-msgid "SPAIN"
-msgstr ""
-
-msgctxt "#30115"
-msgid "UNITED KINGDOM"
-msgstr ""
-
-msgctxt "#30116"
-msgid "USA"
-msgstr ""
-
-#empty strings from id 30117 to 30200
-
-msgctxt "#30201"
-msgid "Czech"
-msgstr ""
-
-msgctxt "#30202"
-msgid "French"
-msgstr ""
-
-msgctxt "#30203"
-msgid "German"
-msgstr ""
-
-msgctxt "#30204"
-msgid "Hindi"
-msgstr ""
-
-msgctxt "#30205"
-msgid "Italian"
-msgstr ""
-
-msgctxt "#30206"
-msgid "Polish"
-msgstr ""
-
-msgctxt "#30207"
-msgid "Portuguese"
-msgstr ""
-
-msgctxt "#30208"
-msgid "Romanian"
-msgstr ""
-
-msgctxt "#30209"
-msgid "Russian"
-msgstr ""
-
-msgctxt "#30210"
-msgid "Serbian"
-msgstr ""
-
-msgctxt "#30211"
-msgid "Spanish"
-msgstr ""
-
-msgctxt "#30212"
-msgid "Turkish"
-msgstr ""
-
-msgctxt "#30213"
-msgid "English"
-msgstr ""
-
-#empty strings from id 30214 to 30299
+#empty strings from id 30067 to 30299
 
 msgctxt "#30300"
 msgid "Error"
@@ -316,3 +196,7 @@ msgstr ""
 msgctxt "#30302"
 msgid "Please install python module \"pytz\" or disable program guides from addon settings"
 msgstr ""
+
+msgctxt "#30303"
+msgid "Plexus addon not installed!"
+msgstr ""

resources/settings.xml

@@ -13,9 +13,11 @@
     <setting id="local_port" type="number" label="30012" default="9000"/>
     <setting id="video_port" type="number" label="30013" default="9001"/>
     <setting id="buffer_size" type="number" label="30014" default="8192"/>
+    <setting id="use_plexus_sop" type="bool" label="30027" default="false"/>
     <setting type="lsep" label="30023"/>
     <setting id="ace_host" type="text" label="30024" default="127.0.0.1"/>
     <setting id="ace_port" type="number" label="30025" default="62062"/>
+    <setting id="use_plexus_ace" type="bool" label="30027" default="false"/>
   </category>
   <category label="30002">
     <setting type="sep" />
@@ -30,44 +32,5 @@
     <setting id="show_offline_ch" type="bool" label="30018" default="true"/>
     <setting id="show_unverified" type="bool" label="30026" default="false"/>
     <setting type="sep" />
-    <!--<setting id="language" type="labelenum" label="30018" values="One|Two|Three|Four"/>-->
-    <!--<setting id="language1" type="select" label="30018" mask="/" source="/resources/country" />-->
   </category>
-  <!--	
-  <category label="30004">
-    <setting id="country_at" type="bool" label="30100" default="true"/>
-    <setting id="country_cz" type="bool" label="30101" default="true"/>
-    <setting id="country_fr" type="bool" label="30102" default="true"/>
-    <setting id="country_de" type="bool" label="30103" default="true"/>
-    <setting id="country_in" type="bool" label="30104" default="true"/>
-    <setting id="country_it" type="bool" label="30105" default="true"/>
-    <setting id="country_md" type="bool" label="30106" default="true"/>
-    <setting id="country_pl" type="bool" label="30107" default="true"/>
-    <setting id="country_pt" type="bool" label="30108" default="true"/>
-    <setting id="country_ro" type="bool" label="30109" default="true"/>
-    <setting id="country_ru" type="bool" label="30110" default="true"/>
-    <setting id="country_cs" type="bool" label="30111" default="true"/>
-    <setting id="country_es" type="bool" label="30112" default="true"/>
-    <setting id="country_tr" type="bool" label="30113" default="true"/>
-    <setting id="country_uk" type="bool" label="30114" default="true"/>
-    <setting id="country_us" type="bool" label="30115" default="true"/>
-    <setting id="country_none" type="bool" label="30021" default="true"/>
-  </category>
-  <category label="30005">
-    <setting id="lang_cz" type="bool" label="30201" default="true"/>
-    <setting id="lang_fr" type="bool" label="30202" default="true"/>
-    <setting id="lang_de" type="bool" label="30203" default="true"/>
-    <setting id="lang_in" type="bool" label="30204" default="true"/>
-    <setting id="lang_it" type="bool" label="30205" default="true"/>
-    <setting id="lang_pl" type="bool" label="30206" default="true"/>
-    <setting id="lang_pt" type="bool" label="30207" default="true"/>
-    <setting id="lang_ro" type="bool" label="30208" default="true"/>
-    <setting id="lang_ru" type="bool" label="30209" default="true"/>
-    <setting id="lang_cs" type="bool" label="30210" default="true"/>
-    <setting id="lang_es" type="bool" label="30211" default="true"/>
-    <setting id="lang_tr" type="bool" label="30212" default="true"/>
-    <setting id="lang_uk" type="bool" label="30213" default="true"/>
-    <setting id="lang_none" type="bool" label="30021" default="true"/>
-  </category>
-  -->
 </settings>

settings.py

@@ -57,6 +57,7 @@ class SETTINGS(object):
   LOCAL_PORT =  addon.getSetting('local_port')
   VIDEO_PORT =  addon.getSetting('video_port')
   BUFER_SIZE = int(addon.getSetting('buffer_size'))
+  USE_PLEXUS_SOP = addon.getSetting('use_plexus_sop')
 
   LOCAL_URL = "http://localhost:"+str(VIDEO_PORT)+"/?"
 
@@ -68,4 +69,5 @@ class SETTINGS(object):
   PRODUCT_KEY='n51LvQoTlJzNGaFxseRK-uvnvX-sD4Vm5Axwmc4UcoD-jruxmKsuJaH0eVgE' #aceproxy
   ACE_HOST = addon.getSetting('ace_host')
   ACE_PORT = int(addon.getSetting('ace_port'))
+  USE_PLEXUS_ACE = addon.getSetting('use_plexus_ace')
   ##########################################################