Rezzect/syncplay
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Hopefully fix VLC playlist file loading issues

Browse Source
This commit is contained in:
Et0h 2015-10-24 00:04:04 +01:00
parent 34f4509380
commit 9d28822731
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
resources/lua/intf/syncplay.lua
View File

@ -5,7 +5,7 @@
Principal author: Etoh Principal author: Etoh
Other contributors: DerGenaue, jb Other contributors: DerGenaue, jb
Project: http://syncplay.pl/ Project: http://syncplay.pl/
Version: 0.2.8 Version: 0.2.9
Note: Note:
* This interface module is intended to be used in conjunction with Syncplay. * This interface module is intended to be used in conjunction with Syncplay.
@ -84,7 +84,7 @@ You may also need to re-copy the syncplay.lua file when you update VLC.
--]==========================================================================] --]==========================================================================]
local connectorversion = "0.2.8" local connectorversion = "0.2.9"
local vlcversion = vlc.misc.version() local vlcversion = vlc.misc.version()
local durationdelay = 500000 -- Pause for get_duration command etc for increased reliability (uses microseconds) local durationdelay = 500000 -- Pause for get_duration command etc for increased reliability (uses microseconds)
local loopsleepduration = 2500 -- Pause for every event loop (uses microseconds) local loopsleepduration = 2500 -- Pause for every event loop (uses microseconds)
@ -463,7 +463,9 @@ function load_file (filepath)
-- [Used by load-file command] -- [Used by load-file command]
local uri = vlc.strings.make_uri(filepath) local uri = vlc.strings.make_uri(filepath)
vlc.playlist.add({{path=uri}}) vlc.playlist.clear()
vlc.playlist.enqueue({{path=uri}})
vlc.playlist.next()
return "load-file-attempted\n" return "load-file-attempted\n"
end end

2
syncplay/constants.py
View File

@ -69,7 +69,7 @@ COMMANDS_AUTH = ['a','auth']
COMMANDS_TOGGLE = ['t','toggle'] COMMANDS_TOGGLE = ['t','toggle']
MPC_MIN_VER = "1.6.4" MPC_MIN_VER = "1.6.4"
VLC_MIN_VERSION = "2.2.1" VLC_MIN_VERSION = "2.2.1"
VLC_INTERFACE_MIN_VERSION = "0.2.8" VLC_INTERFACE_MIN_VERSION = "0.2.9"
VLC_LATENCY_ERROR_THRESHOLD = 2.0 VLC_LATENCY_ERROR_THRESHOLD = 2.0
MPV_UNRESPONSIVE_THRESHOLD = 60.0 MPV_UNRESPONSIVE_THRESHOLD = 60.0
CONTROLLED_ROOMS_MIN_VERSION = "1.3.0" CONTROLLED_ROOMS_MIN_VERSION = "1.3.0"

4
syncplay/players/vlc.py
View File

@ -141,6 +141,10 @@ class VlcPlayer(BasePlayer):
return fileURL return fileURL
def openFile(self, filePath, resetPosition=False): def openFile(self, filePath, resetPosition=False):
if not utils.isURL(filePath):
normedPath = os.path.normpath(filePath)
if os.path.isfile(normedPath):
filePath = normedPath
if utils.isASCII(filePath): if utils.isASCII(filePath):
self._listener.sendLine('load-file: {}'.format(filePath.encode('ascii', 'ignore'))) self._listener.sendLine('load-file: {}'.format(filePath.encode('ascii', 'ignore')))
else: else: