From 2128432675f13acdce382742159e1b79a7c36d72 Mon Sep 17 00:00:00 2001 From: Et0h Date: Sun, 17 Jul 2016 12:00:07 +0100 Subject: [PATCH 1/4] Fix bug where playlist selection is changed when playlist is updated after previously being modified by a different user --- syncplay/client.py | 1 + 1 file changed, 1 insertion(+) diff --git a/syncplay/client.py b/syncplay/client.py index 43f2064..2f52014 100644 --- a/syncplay/client.py +++ b/syncplay/client.py @@ -1396,6 +1396,7 @@ class SyncplayPlaylist(): if not self._client.sharedPlaylistIsEnabled(): self._playlistIndex = index if username is not None and self._client.userlist.currentUser.file and filename == self._client.userlist.currentUser.file['name']: + self._playlistIndex = index return except IndexError: pass From 08eb9d24b12ea417dab674d84bacce1e17fb7bed Mon Sep 17 00:00:00 2001 From: Et0h Date: Sun, 17 Jul 2016 12:01:04 +0100 Subject: [PATCH 2/4] Upver release to 29 --- syncplay/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syncplay/__init__.py b/syncplay/__init__.py index 31a5492..6f250f6 100644 --- a/syncplay/__init__.py +++ b/syncplay/__init__.py @@ -1,4 +1,4 @@ version = '1.4.0' milestone = 'Yoitsu' -release_number = '28' +release_number = '29' projectURL = 'http://syncplay.pl/' From 8307236b11df663d1f98b717e6ea3a680c6e0f2f Mon Sep 17 00:00:00 2001 From: Et0h Date: Sun, 17 Jul 2016 12:33:55 +0100 Subject: [PATCH 3/4] Fix VLC load file code so it actually plays, and be more stringent on old VLC versions as they randomly crash --- resources/lua/intf/syncplay.lua | 9 +++++---- syncplay/__init__.py | 2 +- syncplay/constants.py | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/resources/lua/intf/syncplay.lua b/resources/lua/intf/syncplay.lua index 6725cb1..ebef3d5 100644 --- a/resources/lua/intf/syncplay.lua +++ b/resources/lua/intf/syncplay.lua @@ -5,7 +5,7 @@ Principal author: Etoh Other contributors: DerGenaue, jb Project: http://syncplay.pl/ - Version: 0.2.9 + Version: 0.3.0 Note: * 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.9" +local connectorversion = "0.3.0" local vlcversion = vlc.misc.version() local durationdelay = 500000 -- Pause for get_duration command etc for increased reliability (uses microseconds) local loopsleepduration = 2500 -- Pause for every event loop (uses microseconds) @@ -466,6 +466,7 @@ function load_file (filepath) vlc.playlist.clear() vlc.playlist.enqueue({{path=uri}}) vlc.playlist.next() + vlc.playlist.play() return "load-file-attempted\n" end @@ -532,8 +533,8 @@ function set_playstate(argument) return errormsg end -if string.sub(vlcversion,1,2) == "1." then - vlc.msg.err("This version of VLC is not known to support the Syncplay interface module. Please use VLC 2+.") +if string.sub(vlcversion,1,2) == "1." or string.sub(vlcversion,1,3) == "2.0" or string.sub(vlcversion,1,3) == "2.1" or string.sub(vlcversion,1,5) == "2.2.0" then + vlc.msg.err("This version of VLC does not support Syncplay. Please use VLC 2.2.1+.") quit_vlc() else l = vlc.net.listen_tcp(host, port) diff --git a/syncplay/__init__.py b/syncplay/__init__.py index 6f250f6..feb3a05 100644 --- a/syncplay/__init__.py +++ b/syncplay/__init__.py @@ -1,4 +1,4 @@ version = '1.4.0' milestone = 'Yoitsu' -release_number = '29' +release_number = '30' projectURL = 'http://syncplay.pl/' diff --git a/syncplay/constants.py b/syncplay/constants.py index 135ebe4..97af0ce 100644 --- a/syncplay/constants.py +++ b/syncplay/constants.py @@ -72,7 +72,7 @@ COMMANDS_AUTH = ['a','auth'] COMMANDS_TOGGLE = ['t','toggle'] MPC_MIN_VER = "1.6.4" VLC_MIN_VERSION = "2.2.1" -VLC_INTERFACE_MIN_VERSION = "0.2.9" +VLC_INTERFACE_MIN_VERSION = "0.3.0" VLC_LATENCY_ERROR_THRESHOLD = 2.0 MPV_UNRESPONSIVE_THRESHOLD = 60.0 CONTROLLED_ROOMS_MIN_VERSION = "1.3.0" From 76d63c94067320a3c0dee4269abea4a43e9cd232 Mon Sep 17 00:00:00 2001 From: Et0h Date: Sun, 17 Jul 2016 13:09:27 +0100 Subject: [PATCH 4/4] Note that on some Linux systems syncplay.lua should be in /lib64/ not /lib/ --- resources/lua/intf/syncplay.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lua/intf/syncplay.lua b/resources/lua/intf/syncplay.lua index ebef3d5..df012d5 100644 --- a/resources/lua/intf/syncplay.lua +++ b/resources/lua/intf/syncplay.lua @@ -19,7 +19,7 @@ Place the syncplay.lua file in the main (all user) VLC /lua/intf/ sub-directory: * Window: %ProgramFiles%\VideoLAN\VLC\lua\intf\ -* Linux: /usr/lib/vlc/lua/intf/ +* Linux: /usr/lib/vlc/lua/intf/ or on some systems /usr/lib64/vlc/lua/intf/ (use whichever one already has .luac files in it) * Mac OS X: /Applications/VLC.app/Contents/MacOS/share/lua/intf/ * FreeBSD, OpenBSD etc.: /usr/local/lib/vlc/lua/intf/