Merge remote-tracking branch 'refs/remotes/origin/master' into develop
This commit is contained in:
commit
9344141a2c
3 changed files with 5 additions and 2 deletions
|
@ -1,7 +1,7 @@
|
||||||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||||
<addon id="plugin.video.emby"
|
<addon id="plugin.video.emby"
|
||||||
name="Emby"
|
name="Emby"
|
||||||
version="2.2.18"
|
version="2.2.19"
|
||||||
provider-name="Emby.media">
|
provider-name="Emby.media">
|
||||||
<requires>
|
<requires>
|
||||||
<import addon="xbmc.python" version="2.1.0"/>
|
<import addon="xbmc.python" version="2.1.0"/>
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
version 2.2.19
|
||||||
|
- Fix transcode (logging error)
|
||||||
|
|
||||||
version 2.2.18
|
version 2.2.18
|
||||||
- Fix logging
|
- Fix logging
|
||||||
|
|
||||||
|
|
|
@ -389,7 +389,7 @@ class PlayUtils():
|
||||||
itemid = self.item['Id']
|
itemid = self.item['Id']
|
||||||
url = [("%s/Videos/%s/%s/Subtitles/%s/Stream.srt"
|
url = [("%s/Videos/%s/%s/Subtitles/%s/Stream.srt"
|
||||||
% (self.server, itemid, itemid, selectSubsIndex))]
|
% (self.server, itemid, itemid, selectSubsIndex))]
|
||||||
self.logMsg("Set up subtitles: %s %s" % (selectSubsIndex, url), 1)
|
log.info("Set up subtitles: %s %s" % (selectSubsIndex, url))
|
||||||
listitem.setSubtitles(url)
|
listitem.setSubtitles(url)
|
||||||
else:
|
else:
|
||||||
# Burn subtitles
|
# Burn subtitles
|
||||||
|
|
Loading…
Reference in a new issue