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

Support for Snap VLC on Linux

Browse Source 
Add the snap VLC path to the discovery list and automatically copy
our lua script in the correct path for snap installations.

Fixes: #222
This commit is contained in:
Alberto Sottile 2019-05-20 11:26:35 +02:00
parent 7862c27d54
commit a9172f9fa6
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
syncplay/constants.py
View File

@ -162,7 +162,8 @@ VLC_PATHS = [
"/usr/bin/vlc-wrapper", "/usr/bin/vlc-wrapper",
"/Applications/VLC.app/Contents/MacOS/VLC", "/Applications/VLC.app/Contents/MacOS/VLC",
"/usr/local/bin/vlc", "/usr/local/bin/vlc",
"/usr/local/bin/vlc-wrapper" "/usr/local/bin/vlc-wrapper",
"/snap/bin/vlc"
] ]
VLC_ICONPATH = "vlc.png" VLC_ICONPATH = "vlc.png"

8
syncplay/players/vlc.py
View File

@ -340,8 +340,12 @@ class VlcPlayer(BasePlayer):
else: else:
call.append(self.__playerController.getMRL(filePath)) call.append(self.__playerController.getMRL(filePath))
if isLinux(): if isLinux():
playerController.vlcIntfPath = "/usr/lib/vlc/lua/intf/" if 'snap' in playerPath:
playerController.vlcIntfUserPath = os.path.join(os.getenv('HOME', '.'), ".local/share/vlc/lua/intf/") playerController.vlcIntfPath = '/snap/vlc/current/usr/lib/vlc/lua/intf/'
playerController.vlcIntfUserPath = os.path.join(os.getenv('HOME', '.'), "snap/vlc/current/.local/share/vlc/lua/intf/")
else:
playerController.vlcIntfPath = "/usr/lib/vlc/lua/intf/"
playerController.vlcIntfUserPath = os.path.join(os.getenv('HOME', '.'), ".local/share/vlc/lua/intf/")
elif isMacOS(): elif isMacOS():
playerController.vlcIntfPath = "/Applications/VLC.app/Contents/MacOS/share/lua/intf/" playerController.vlcIntfPath = "/Applications/VLC.app/Contents/MacOS/share/lua/intf/"
playerController.vlcIntfUserPath = os.path.join( playerController.vlcIntfUserPath = os.path.join(