diff --git a/changelog.txt b/changelog.txt index dfeadd1..1e56b46 100644 --- a/changelog.txt +++ b/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 diff --git a/default.py b/default.py index 39fcc3a..2e92922 100644 --- a/default.py +++ b/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: diff --git a/resources/language/English/strings.po b/resources/language/English/strings.po index 4e2c45a..81d6d07 100644 --- a/resources/language/English/strings.po +++ b/resources/language/English/strings.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: XBMC-Addons\n" "Report-Msgid-Bugs-To: alanwww1@xbmc.org\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 \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 "" \ No newline at end of file diff --git a/resources/language/English/strings.xml b/resources/language/English/strings.xml deleted file mode 100644 index b777e0d..0000000 --- a/resources/language/English/strings.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - - - General - Engines - Schedule - Channel List - Channel Countries - Channel Language - - Enable Add-on Debugging - Wait time before atempting to start the player [ms] - Local port (where others can connect) - Video port - Buffer Size - Disable program guides - Remote channel list URL - Channel list expire [hours] (0 = no update) - Show offline channels - Load program guide when displaying channel list - Sopcast path for ARM system (Raspberry Pi) - unclassified - Sopcast - Acestream - Engine host - Engine TCP port - Show unverified - - AUSTRIA - CZECH REPUBLIC - FRANCE - GERMANY - INDIA - ITALY - MOLDOVA - POLAND - PORTUGAL - ROMANIA - RUSSIAN FEDERATION - SERBIA - SPAIN - TURKEY - SPAIN - UNITED KINGDOM - USA - - Czech - French - German - Hindi - Italian - Polish - Portuguese - Romanian - Russian - Serbian - Spanish - Turkish - English - - Refresh Schedule - Refresh All Schedules - Refresh Channel List - Downloading Channel list - Channel list - Downloading Channel Logo - Program guide is up to date - Channel is offline - Network is offline - Channel initialization failed - Sream - Downloading Program Guide - Program guide - Offline - Program guide is not available - Get stream URL - unverified - - Error - Cannot parse channel list ! - Please install python module "pytz" or disable program guides from addon settings - - \ No newline at end of file diff --git a/resources/settings.xml b/resources/settings.xml index ed2d5c7..1292e46 100644 --- a/resources/settings.xml +++ b/resources/settings.xml @@ -13,9 +13,11 @@ + + @@ -30,44 +32,5 @@ - - - \ No newline at end of file diff --git a/settings.py b/settings.py index 3730b97..bea607b 100644 --- a/settings.py +++ b/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') ##########################################################