Merge pull request #104 from Syncplay/master

Rebase chat to RC2

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.
@@ -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/
 
@@ -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)

syncplay/__init__.py

@@ -1,4 +1,4 @@
 version = '1.5.0'
 milestone = 'Yoitsu'
-release_number = '28'
+release_number = '30'
 projectURL = 'http://syncplay.pl/'

syncplay/client.py

@@ -1420,6 +1420,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

syncplay/constants.py

@@ -73,7 +73,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"