Jellyfin/jellyfin-kodi
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-kodi.git synced 2024-12-24 01:36:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

use the plugin method for playback when transcoding, use native kodi playback for direct access

Browse source
This commit is contained in:
Marcel van der Veldt 2015-03-28 19:04:32 +01:00
parent 7493e57fcb
commit 03d99ed0d8
4 changed files with 23 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
resources/lib/CreateFiles.py
View file

@ -63,6 +63,10 @@ class CreateFiles():
host = addon.getSetting('ipaddress')
server = host + ":" + port
playurl = PlayUtils().getPlayUrl(server, item["Id"], item)
#do not use direct path for transcoding
if playurl.startswith("http"):
playurl = "plugin://plugin.video.emby/?id=" + item["Id"] + '&mode=play'
text_file.writelines(playurl)
text_file.close()

9
resources/lib/PlayUtils.py
View file

@ -76,10 +76,11 @@ class PlayUtils():
# Works out if we are direct playing or not
def isDirectPlay(self, result):
if (self.fileExists(result) or (result.get("LocationType") == "FileSystem" and self.isNetworkQualitySufficient(result) == True and self.isLocalPath(result) == False)):
return True
else:
return False
# if (self.fileExists(result) or (result.get("LocationType") == "FileSystem" and self.isNetworkQualitySufficient(result) == True and self.isLocalPath(result) == False)):
# return True
# else:
# return False
return False
# Works out if the network quality can play directly or if transcoding is needed

34
resources/lib/WriteKodiDB.py
View file

@ -99,6 +99,8 @@ class WriteKodiDB():
#set Filename
playurl = PlayUtils().getPlayUrl(server, MBitem["Id"], MBitem)
if playurl.startswith("http"):
playurl = "plugin://plugin.video.emby/?id=" + MBitem["Id"] + '&mode=play'
if playurl != KodiItem["file"]:
self.setKodiFilename(KodiItem["movieid"], playurl, "movie")
@ -432,6 +434,8 @@ class WriteKodiDB():
#set Filename
playurl = PlayUtils().getPlayUrl(server, MBitem["Id"], MBitem)
if playurl.startswith("http"):
playurl = "plugin://plugin.video.emby/?id=" + MBitem["Id"] + '&mode=play'
if playurl != KodiItem["file"]:
self.setKodiFilename(KodiItem["episodeid"], playurl, "episode")
@ -890,28 +894,16 @@ class WriteKodiDB():
def setKodiFilename(self, id, filenameAndPath, fileType):
#use sqlite to set the filename in DB -- needed to avoid problems with resumepoints etc
#todo --> submit PR to kodi team to get this added to the jsonrpc api
#todo --> extend support for musicvideos
filenameAndPath = utils.convertEncoding(filenameAndPath)
print "set filepath for id " + str(id)
if not filenameAndPath.startswith("http"):
#assume direct play
if "\\" in filenameAndPath:
filename = filenameAndPath.rsplit("\\",1)[-1]
path = filenameAndPath.replace(filename,"")
elif "/" in filenameAndPath:
filename = filenameAndPath.rsplit("/",1)[-1]
path = filenameAndPath.replace(filename,"")
else:
#assume play from stream ?
filename = filenameAndPath
path = "plugin://plugin.video.emby/"
else:
#assume play from stream
filename = filenameAndPath
path = "plugin://plugin.video.emby/"
if "\\" in filenameAndPath:
filename = filenameAndPath.rsplit("\\",1)[-1]
path = filenameAndPath.replace(filename,"")
elif "/" in filenameAndPath:
filename = filenameAndPath.rsplit("/",1)[-1]
path = filenameAndPath.replace(filename,"")
utils.logMsg("MB3 Sync","setting filename in kodi db..." + fileType + ": " + str(id))
xbmc.sleep(sleepVal)
connection = utils.KodiSQL()

2
resources/settings.xml
View file

@ -29,7 +29,7 @@
</category>
<category label="Playback"> <!-- Extra Sync options -->
<setting id="addExtraPlaybackArt" type="bool" label="Add extra playback art" default="true" visible="true" enable="true" />
<setting id="addExtraPlaybackArt" type="bool" label="Add extra playback art" default="true" visible="false" enable="true" />
<setting id="smbusername" type="text" label="30007" default="" visible="true" enable="true" />
<setting id="smbpassword" type="text" label="30008" default="" option="hidden" visible="true" enable="true" />
</category>