RepoMirrors
/
syncplay
mirror of https://github.com/Syncplay/syncplay
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added support for several BSDs

This commit is contained in:
nilsding 2014-08-14 20:43:37 +02:00
parent 1c9c31bd1a
commit 097327f6e3
4 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,6 +21,7 @@ Place the syncplay.lua file in the main (all user) VLC /lua/intf/ sub-directory:
* Window: %ProgramFiles%\VideoLAN\VLC\lua\intf\ * Window: %ProgramFiles%\VideoLAN\VLC\lua\intf\
* Linux: /usr/lib/vlc/lua/intf/ * Linux: /usr/lib/vlc/lua/intf/
* Mac OS X: /Applications/VLC.app/Contents/MacOS/share/lua/intf/ * Mac OS X: /Applications/VLC.app/Contents/MacOS/share/lua/intf/
* FreeBSD, OpenBSD etc.: /usr/local/lib/vlc/lua/intf/
You may also need to re-copy the syncplay.lua file when you update VLC. You may also need to re-copy the syncplay.lua file when you update VLC.

4
syncplay/constants.py
View File

@ -70,7 +70,9 @@ VLC_PATHS = [
r"C:\Program Files\VideoLAN\VLC\vlc.exe", r"C:\Program Files\VideoLAN\VLC\vlc.exe",
"/usr/bin/vlc", "/usr/bin/vlc",
"/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-wrapper"
] ]
VLC_ICONPATH = "vlc.png" VLC_ICONPATH = "vlc.png"

5
syncplay/players/vlc.py
View File

@ -256,6 +256,11 @@ class VlcPlayer(BasePlayer):
elif sys.platform.startswith('darwin'): elif sys.platform.startswith('darwin'):
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(os.getenv('HOME', '.'), "Library/Application Support/org.videolan.vlc/lua/intf/") playerController.vlcIntfUserPath = os.path.join(os.getenv('HOME', '.'), "Library/Application Support/org.videolan.vlc/lua/intf/")
elif 'bsd' in sys.platform or sys.platform.startswith('dragonfly'):
# *BSD ports/pkgs install to /usr/local by default.
# This should also work for all the other BSDs, such as OpenBSD or DragonFly.
playerController.vlcIntfPath = "/usr/local/lib/vlc/lua/intf/"
playerController.vlcIntfUserPath = os.path.join(os.getenv('HOME', '.'), ".local/share/vlc/lua/intf/")
else: else:
playerController.vlcIntfPath = os.path.dirname(playerPath).replace("\\", "/") + "/lua/intf/" playerController.vlcIntfPath = os.path.dirname(playerPath).replace("\\", "/") + "/lua/intf/"
playerController.vlcIntfUserPath = os.path.join(os.getenv('APPDATA', '.'), "VLC\\lua\\intf\\") playerController.vlcIntfUserPath = os.path.join(os.getenv('APPDATA', '.'), "VLC\\lua\\intf\\")

2
syncplay/ui/GuiConfiguration.py
View File

@ -131,6 +131,8 @@ class ConfigDialog(QtGui.QDialog):
defaultdirectory = "/usr/bin" defaultdirectory = "/usr/bin"
elif sys.platform.startswith('darwin'): elif sys.platform.startswith('darwin'):
defaultdirectory = "/Applications/" defaultdirectory = "/Applications/"
elif "bsd" in sys.platform or sys.platform.startswith('dragonfly'):
defaultdirectory = "/usr/local/bin"
fileName, filtr = QtGui.QFileDialog.getOpenFileName(self, fileName, filtr = QtGui.QFileDialog.getOpenFileName(self,
"Browse for media player executable", "Browse for media player executable",