Merge branch 'master' into add-missmatch-san-error

.travis.yml

@@ -1,21 +1,22 @@
-matrix:
+# These two are defaults, which get overriden by the jobs matrix
+language: minimal
+os: linux
+
+jobs:
   include:
     - language: objective-c
+      os: osx
       osx_image: xcode8.3
-    - language: bash
+    - language: minimal
-      sudo: required
       dist: xenial
+      os: linux
       env: BUILD_DESTINATION=snapcraft
     - language: python
-      sudo: required
+      os: linux
       dist: xenial
       python: 3.6
       env: BUILD_DESTINATION=appimage
 
-branches:
-  only:
-  - master
-
 script:
 - if [ "$TRAVIS_OS_NAME" == "osx" ]; then python3 buildPy2app.py py2app ; fi
 - if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$BUILD_DESTINATION" == "snapcraft" ]; then sudo snapcraft cleanbuild ; fi

GNUmakefile

@@ -37,22 +37,16 @@ endif
 common:
 	-mkdir -p $(LIB_PATH)/syncplay/syncplay/resources/lua/intf
 	-mkdir -p $(APP_SHORTCUT_PATH)
-	-mkdir -p $(SHARE_PATH)/app-install/icons
-	-mkdir -p $(SHARE_PATH)/pixmaps/
 	cp -r syncplay $(LIB_PATH)/syncplay/
 	chmod 755 $(LIB_PATH)/syncplay/
 	cp -r syncplay/resources/hicolor $(SHARE_PATH)/icons/
 	cp -r syncplay/resources/*.png $(LIB_PATH)/syncplay/syncplay/resources/
 	cp -r syncplay/resources/*.lua $(LIB_PATH)/syncplay/syncplay/resources/
 	cp -r syncplay/resources/lua/intf/*.lua $(LIB_PATH)/syncplay/syncplay/resources/lua/intf/
-	cp syncplay/resources/hicolor/48x48/apps/syncplay.png $(SHARE_PATH)/app-install/icons/
-	cp syncplay/resources/hicolor/48x48/apps/syncplay.png $(SHARE_PATH)/pixmaps/
 
 u-common:
 	-rm -rf $(LIB_PATH)/syncplay
 	-rm $(SHARE_PATH)/icons/hicolor/*/apps/syncplay.png
-	-rm $(SHARE_PATH)/app-install/icons/syncplay.png
-	-rm $(SHARE_PATH)/pixmaps/syncplay.png
 
 client:
 	-mkdir -p $(BIN_PATH)

README.md

@@ -21,7 +21,9 @@
 # SOFTWARE.
 -->
 
-#  Syncplay
+# Syncplay
+[![Travis build Status](https://travis-ci.org/Syncplay/syncplay.svg?branch=master)](https://travis-ci.org/Syncplay/syncplay)
+[![Appveyor build status](https://ci.appveyor.com/api/projects/status/github/Syncplay/syncplay)](https://ci.appveyor.com/project/Et0h/syncplay/branch/master)
 
 Solution to synchronize video playback across multiple instances of mpv, VLC, MPC-HC, MPC-BE and mplayer2 over the Internet.
 

buildPy2exe.py

@@ -30,7 +30,7 @@ import syncplay
 from syncplay.messages import getMissingStrings
 
 missingStrings = getMissingStrings()
-if missingStrings is not None and missingStrings is not "":
+if missingStrings is not None and missingStrings != "":
     import warnings
     warnings.warn("MISSING/UNUSED STRINGS DETECTED:\n{}".format(missingStrings))
 
@@ -63,6 +63,7 @@ NSIS_SCRIPT_TEMPLATE = r"""
   LoadLanguageFile "$${NSISDIR}\Contrib\Language files\German.nlf"
   LoadLanguageFile "$${NSISDIR}\Contrib\Language files\Italian.nlf"
   LoadLanguageFile "$${NSISDIR}\Contrib\Language files\Spanish.nlf"
+  LoadLanguageFile "$${NSISDIR}\Contrib\Language files\PortugueseBR.nlf"
 
   Unicode true
 
@@ -101,6 +102,11 @@ NSIS_SCRIPT_TEMPLATE = r"""
   VIAddVersionKey /LANG=$${LANG_SPANISH} "LegalCopyright" "Syncplay"
   VIAddVersionKey /LANG=$${LANG_SPANISH} "FileDescription" "Syncplay"
 
+  VIAddVersionKey /LANG=$${LANG_PORTUGUESEBR} "ProductName" "Syncplay"
+  VIAddVersionKey /LANG=$${LANG_PORTUGUESEBR} "FileVersion" "$version.0"
+  VIAddVersionKey /LANG=$${LANG_PORTUGUESEBR} "LegalCopyright" "Syncplay"
+  VIAddVersionKey /LANG=$${LANG_PORTUGUESEBR} "FileDescription" "Syncplay"
+
   LangString ^SyncplayLanguage $${LANG_ENGLISH} "en"
   LangString ^Associate $${LANG_ENGLISH} "Associate Syncplay with multimedia files."
   LangString ^Shortcut $${LANG_ENGLISH} "Create Shortcuts in following locations:"
@@ -154,6 +160,15 @@ NSIS_SCRIPT_TEMPLATE = r"""
   LangString ^AutomaticUpdates $${LANG_SPANISH} "Buscar actualizaciones automáticamente"
   LangString ^UninstConfig $${LANG_SPANISH} "Borrar archivo de configuración."
 
+  LangString ^SyncplayLanguage $${LANG_PORTUGUESEBR} "pt_BR"
+  LangString ^Associate $${LANG_PORTUGUESEBR} "Associar Syncplay aos arquivos multimídia."
+  LangString ^Shortcut $${LANG_PORTUGUESEBR} "Criar atalhos nos seguintes locais:"
+  LangString ^StartMenu $${LANG_PORTUGUESEBR} "Menu Iniciar"
+  LangString ^Desktop $${LANG_PORTUGUESEBR} "Área de trabalho"
+  LangString ^QuickLaunchBar $${LANG_PORTUGUESEBR} "Barra de acesso rápido"
+  LangString ^AutomaticUpdates $${LANG_PORTUGUESEBR} "Verificar atualizações automaticamente"
+  LangString ^UninstConfig $${LANG_PORTUGUESEBR} "Deletar arquivo de configuração."
+
   ; Remove text to save space
   LangString ^ClickInstall $${LANG_GERMAN} " "
 
@@ -259,6 +274,8 @@ NSIS_SCRIPT_TEMPLATE = r"""
     Push Italiano
     Push $${LANG_SPANISH}
     Push Español
+    Push $${LANG_PORTUGUESEBR}
+    Push 'Português do Brasil'
     Push A ; A means auto count languages
     LangDLL::LangDialog "Language Selection" "Please select the language of Syncplay and the installer"
     Pop $$LANGUAGE
@@ -670,10 +687,9 @@ class build_installer(py2exe):
         script.compile()
         print("*** DONE ***")
 
-guiIcons = glob('syncplay/resources/*.png') +  ['syncplay/resources/spinner.mng']
+guiIcons = glob('syncplay/resources/*.ico') + glob('syncplay/resources/*.png') +  ['syncplay/resources/spinner.mng']
 
 resources = [
-    "syncplay/resources/icon.ico",
     "syncplay/resources/syncplayintf.lua",
     "syncplay/resources/license.rtf",
     "syncplay/resources/third-party-notices.rtf"
@@ -719,4 +735,4 @@ info = dict(
 )
 
 sys.argv.extend(['py2exe'])
-setup(**info)
+setup(**info)

syncplay/__init__.py

@@ -1,5 +1,5 @@
 version = '1.6.5'
 revision = ' development'
 milestone = 'Yoitsu'
-release_number = '81'
+release_number = '84'
 projectURL = 'https://syncplay.pl/'

syncplay/client.py

@@ -9,6 +9,7 @@ import re
 import sys
 import threading
 import time
+from fnmatch import fnmatch
 from copy import deepcopy
 from functools import wraps
 
@@ -135,7 +136,7 @@ class SyncplayClient(object):
 
         if constants.DEBUG_MODE and constants.WARN_ABOUT_MISSING_STRINGS:
             missingStrings = getMissingStrings()
-            if missingStrings is not None and missingStrings is not "":
+            if missingStrings is not None and missingStrings != "":
                 self.ui.showDebugMessage("MISSING/UNUSED STRINGS DETECTED:\n{}".format(missingStrings))
 
     def initProtocol(self, protocol):
@@ -199,9 +200,16 @@ class SyncplayClient(object):
             self.setPosition(-1)
             self.ui.showDebugMessage("Rewinded after double-check")
 
+    def isPlayingMusic(self):
+        if self.userlist.currentUser.file:
+            for musicFormat in constants.MUSIC_FORMATS:
+                if self.userlist.currentUser.file['name'].lower().endswith(musicFormat):
+                    return True
+
     def updatePlayerStatus(self, paused, position):
         position -= self.getUserOffset()
         pauseChange, seeked = self._determinePlayerStateChange(paused, position)
+        positionBeforeSeek = self._playerPosition
         self._playerPosition = position
         self._playerPaused = paused
         currentLength = self.userlist.currentUser.file["duration"] if self.userlist.currentUser.file else 0
@@ -222,7 +230,9 @@ class SyncplayClient(object):
 
         if self._lastGlobalUpdate:
             self._lastPlayerUpdate = time.time()
-            if (pauseChange or seeked) and self._protocol:
+            if seeked and not pauseChange and self.isPlayingMusic() and abs(positionBeforeSeek - currentLength) < constants.PLAYLIST_LOAD_NEXT_FILE_TIME_FROM_END_THRESHOLD and self.playlist.notJustChangedPlaylist():
+                self.playlist.loadNextFileInPlaylist()
+            elif (pauseChange or seeked) and self._protocol:
                 if seeked:
                     self.playerPositionBeforeLastSeek = self.getGlobalPosition()
                 self._protocol.sendState(self.getPlayerPosition(), self.getPlayerPaused(), seeked, None, True)
@@ -230,7 +240,10 @@ class SyncplayClient(object):
     def prepareToAdvancePlaylist(self):
         if self.playlist.canSwitchToNextPlaylistIndex():
             self.ui.showDebugMessage("Preparing to advance playlist...")
-            self._protocol.sendState(0, True, True, None, True)
+            if self.isPlayingMusic():
+                self._protocol.sendState(0, False, True, None, True)
+            else:
+                self._protocol.sendState(0, True, True, None, True)
         else:
             self.ui.showDebugMessage("Not preparing to advance playlist because the next file cannot be switched to")
 
@@ -500,15 +513,19 @@ class SyncplayClient(object):
                 if self._config['onlySwitchToTrustedDomains']:
                     if self._config['trustedDomains']:
                         for trustedDomain in self._config['trustedDomains']:
-                            trustableURI = ''.join([trustedProtocol, trustedDomain, "/"])
+                            trustableURI = ''.join([trustedProtocol, trustedDomain, "/*"])
-                            if URIToTest.startswith(trustableURI):
+                            if fnmatch(URIToTest, trustableURI):
                                 return True
                     return False
                 else:
                     return True
         return False
 
-    def openFile(self, filePath, resetPosition=False):
+    def openFile(self, filePath, resetPosition=False, fromUser=False):
+        if fromUser and filePath.endswith(".txt") or filePath.endswith(".m3u") or filePath.endswith(".m3u8"):
+            self.playlist.loadPlaylistFromFile(filePath, resetPosition)
+            return
+
         self.playlist.openedFile()
         self._player.openFile(filePath, resetPosition)
         if resetPosition:
@@ -527,10 +544,10 @@ class SyncplayClient(object):
         self.playlist.changeToPlaylistIndex(*args, **kwargs)
 
     def loopSingleFiles(self):
-        return self._config["loopSingleFiles"]
+        return self._config["loopSingleFiles"] or self.isPlayingMusic()
 
     def isPlaylistLoopingEnabled(self):
-        return self._config["loopAtEndOfPlaylist"]
+        return self._config["loopAtEndOfPlaylist"] or self.isPlayingMusic()
 
     def __executePrivacySettings(self, filename, size):
         if self._config['filenamePrivacyMode'] == PRIVACY_SENDHASHED_MODE:
@@ -629,6 +646,12 @@ class SyncplayClient(object):
         return features
 
     def setRoom(self, roomName, resetAutoplay=False):
+        roomSplit = roomName.split(":")
+        if roomName.startswith("+") and len(roomSplit) > 2:
+            roomName = roomSplit[0] + ":" + roomSplit[1]
+            password = roomSplit[2]
+            self.storeControlPassword(roomName, password)
+            self.ui.updateRoomName(roomName)
         self.userlist.currentUser.room = roomName
         if resetAutoplay:
             self.resetAutoPlayState()
@@ -641,6 +664,7 @@ class SyncplayClient(object):
         self.reIdentifyAsController()
 
     def reIdentifyAsController(self):
+        self.setRoom(self.userlist.currentUser.room)
         room = self.userlist.currentUser.room
         if utils.RoomPasswordProvider.isControlledRoom(room):
             storedRoomPassword = self.getControlledRoomPassword(room)
@@ -661,6 +685,9 @@ class SyncplayClient(object):
         readyState = self._config['readyAtStart'] if self.userlist.currentUser.isReady() is None else self.userlist.currentUser.isReady()
         self._protocol.setReady(readyState, manuallyInitiated=False)
         self.reIdentifyAsController()
+        if self._config["loadPlaylistFromFile"]:
+            self.playlist.loadPlaylistFromFile(self._config["loadPlaylistFromFile"])
+            self._config["loadPlaylistFromFile"] = None
 
     def getRoom(self):
         return self.userlist.currentUser.room
@@ -727,7 +754,7 @@ class SyncplayClient(object):
         self._endpoint = HostnameEndpoint(reactor, host, port)
         try:
             caCertFP = open(os.environ['SSL_CERT_FILE'])
-            caCertTwisted = Certificate.loadPEM(caCertFP.read())
+            caCertTwisted = Certificate.loadPEM(caCertFP.read().encode('utf-8'))
             caCertFP.close()
             self.protocolFactory.options = optionsForClientTLS(hostname=host)
             self._clientSupportsTLS = True
@@ -804,6 +831,10 @@ class SyncplayClient(object):
     @requireServerFeature("chat")
     def sendChat(self, message):
         if self._protocol and self._protocol.logged:
+            try:
+                message = message.replace("\n", "").replace("\r", "")
+            except:
+                pass
             message = utils.truncateText(message, constants.MAX_CHAT_MESSAGE_LENGTH)
             self._protocol.sendChatMessage(message)
 
@@ -830,12 +861,16 @@ class SyncplayClient(object):
             self.autoplayCheck()
 
     def autoplayCheck(self):
+        if self.isPlayingMusic():
+            return True
         if self.autoplayConditionsMet():
             self.startAutoplayCountdown()
         else:
             self.stopAutoplayCountdown()
 
     def instaplayConditionsMet(self):
+        if self.isPlayingMusic():
+            return True
         if not self.userlist.currentUser.canControl():
             return False
 
@@ -934,7 +969,6 @@ class SyncplayClient(object):
         else:
             return ""
 
-    @requireServerFeature("managedRooms")
     def identifyAsController(self, controlPassword):
         controlPassword = self.stripControlPassword(controlPassword)
         self.ui.showMessage(getMessage("identifying-as-controller-notification").format(controlPassword))
@@ -1692,6 +1726,25 @@ class SyncplayPlaylist():
         filename = _playlist[_index] if len(_playlist) > _index else None
         return filename
 
+    def loadPlaylistFromFile(self, path, shuffle=False):
+        if not os.path.isfile(path):
+            self._ui.showDebugMessage("Not loading {} as file could not be found".format(path))
+            return
+
+        with open(path) as f:
+            newPlaylist = f.read().splitlines()
+            if shuffle:
+                random.shuffle(newPlaylist)
+            if newPlaylist:
+                self.changePlaylist(newPlaylist, username=None, resetIndex=True)
+
+    def savePlaylistToFile(self, path):
+        with open(path, 'w') as playlistFile:
+            playlistToSave = utils.getListAsMultilineString(self._playlist)
+            playlistFile.write(playlistToSave)
+            self._ui.showMessage("Playlist saved as {}".format(path)) # TODO: Move to messages_en
+
+
     def changePlaylist(self, files, username=None, resetIndex=False):
         if self._playlist == files:
             if self._playlistIndex != 0 and resetIndex:
@@ -1848,7 +1901,7 @@ class FileSwitchManager(object):
         self.mediaDirectoriesNotFound = []
 
     def setClient(self, newClient):
-        self.client = newClient
+        self._client = newClient
 
     def setCurrentDirectory(self, curDir):
         self.currentDirectory = curDir
@@ -1922,6 +1975,8 @@ class FileSwitchManager(object):
                     if self.mediaFilesCache != newMediaFilesCache:
                         self.mediaFilesCache = newMediaFilesCache
                         self.newInfo = True
+            except Exception as e:
+                self._client.ui.showDebugMessage(str(e))
             finally:
                 self.currentlyUpdating = False
 

syncplay/constants.py

@@ -30,6 +30,7 @@ UI_TIME_FORMAT = "[%X] "
 CONFIG_NAMES = [".syncplay", "syncplay.ini"]  # Syncplay searches first to last
 DEFAULT_CONFIG_NAME = "syncplay.ini"
 RECENT_CLIENT_THRESHOLD = "1.6.4"  # This and higher considered 'recent' clients (no warnings)
+MUSIC_FORMATS = [".mp3", ".m4a", ".m4p", ".wav", ".aiff", ".r", ".ogg", ".flac"] # ALL LOWER CASE!
 WARN_OLD_CLIENTS = True  # Use MOTD to inform old clients to upgrade
 LIST_RELATIVE_CONFIGS = True  # Print list of relative configs loaded
 SHOW_CONTACT_INFO = True  # Displays dev contact details below list in GUI
@@ -234,9 +235,16 @@ USERLIST_GUI_USERNAME_COLUMN = 0
 USERLIST_GUI_FILENAME_COLUMN = 3
 
 MPLAYER_SLAVE_ARGS = ['-slave', '--hr-seek=always', '-nomsgcolor', '-msglevel', 'all=1:global=4:cplayer=4', '-af-add', 'scaletempo']
-MPV_ARGS = ['--force-window', '--idle', '--hr-seek=always', '--keep-open']
+MPV_ARGS = {'force-window': 'yes',
-MPV_SLAVE_ARGS = ['--msg-level=all=error,cplayer=info,term-msg=info', '--input-terminal=no', '--input-file=/dev/stdin']
+            'idle': 'yes',
-MPV_SLAVE_ARGS_NEW = ['--term-playing-msg=<SyncplayUpdateFile>\nANS_filename=${filename}\nANS_length=${=duration:${=length:0}}\nANS_path=${path}\n</SyncplayUpdateFile>', '--terminal=yes']
+            'hr-seek': 'always',
+            'keep-open': 'yes',
+            'input-terminal': 'no',
+            'term-playing-msg': '<SyncplayUpdateFile>\nANS_filename=${filename}\nANS_length=${=duration:${=length:0}}\nANS_path=${path}\n</SyncplayUpdateFile>',
+            'keep-open-pause': 'yes'
+            }
+
+
 MPV_NEW_VERSION = False
 MPV_OSC_VISIBILITY_CHANGE_VERSION = False
 MPV_INPUT_PROMPT_START_CHARACTER = "〉"
@@ -260,7 +268,7 @@ VLC_SLAVE_ARGS = ['--extraintf=luaintf', '--lua-intf=syncplay', '--no-quiet', '-
 VLC_SLAVE_EXTRA_ARGS = getValueForOS({
      OS_DEFAULT: ['--no-one-instance', '--no-one-instance-when-started-from-file'],
      OS_MACOS: ['--verbose=2', '--no-file-logging']})
-MPV_SUPERSEDE_IF_DUPLICATE_COMMANDS = ["no-osd set time-pos ", "loadfile "]
+MPV_SUPERSEDE_IF_DUPLICATE_COMMANDS = ["set_property time-pos ", "loadfile "]
 MPV_REMOVE_BOTH_IF_DUPLICATE_COMMANDS = ["cycle pause"]
 MPLAYER_ANSWER_REGEX = "^ANS_([a-zA-Z_-]+)=(.+)$|^(Exiting)\.\.\. \((.+)\)$"
 VLC_ANSWER_REGEX = r"(?:^(?P<command>[a-zA-Z_]+)(?:\: )?(?P<argument>.*))"

syncplay/messages.py

@@ -6,6 +6,7 @@ from . import messages_ru
 from . import messages_de
 from . import messages_it
 from . import messages_es
+from . import messages_pt_BR
 
 messages = {
     "en": messages_en.en,
@@ -13,6 +14,7 @@ messages = {
     "de": messages_de.de,
     "it": messages_it.it,
     "es": messages_es.es,
+    "es": messages_pt_BR.pt_BR,
     "CURRENT": None
 }
 
@@ -44,9 +46,15 @@ def getMissingStrings():
 
 
 def getInitialLanguage():
-    import locale
     try:
-        initialLanguage = locale.getdefaultlocale()[0].split("_")[0]
+        import sys
+        frozen = getattr(sys, 'frozen', '')
+        if frozen in 'macosx_app':
+            from PySide2.QtCore import QLocale
+            initialLanguage = QLocale.system().uiLanguages()[0].split('-')[0]
+        else:
+            import locale
+            initialLanguage = locale.getdefaultlocale()[0].split("_")[0]
         if initialLanguage not in messages:
             initialLanguage = constants.FALLBACK_INITIAL_LANGUAGE
     except:

syncplay/messages_de.py

@@ -16,7 +16,7 @@ de = {
     "connection-failed-notification": "Verbindung zum Server fehlgeschlagen",
     "connected-successful-notification": "Erfolgreich mit Server verbunden",
     "retrying-notification": "%s, versuche erneut in %d Sekunden...",  # Seconds
-    "reachout-successful-notification": "Successfully reached {} ({})", # TODO: Translate
+    "reachout-successful-notification": "{} ({}) erfolgreich erreicht",
 
     "rewind-notification": "Zurückgespult wegen Zeitdifferenz mit {}",  # User
     "fastforward-notification": "Vorgespult wegen Zeitdifferenz mit {}",  # User
@@ -29,13 +29,13 @@ de = {
 
     "current-offset-notification": "Aktueller Offset: {} Sekunden",  # Offset
 
-    "media-directory-list-updated-notification": "Syncplay media directories have been updated.",  # TODO: Translate
+    "media-directory-list-updated-notification": "Syncplay-Medienverzeichnisse wurden aktualisiert.",
 
-    "room-join-notification": "{} hat den Raum '{}' betreten",  # User
+    "room-join-notification": "{} hat den Raum „{}“ betreten",  # User
     "left-notification": "{} ist gegangen",  # User
     "left-paused-notification": "{} ist gegangen, {} pausierte",  # User who left, User who paused
-    "playing-notification": "{} spielt '{}' ({})",  # User, file, duration
+    "playing-notification": "{} spielt „{}“ ({})",  # User, file, duration
-    "playing-notification/room-addendum":  " in Raum: '{}'",  # Room
+    "playing-notification/room-addendum":  " in Raum: „{}“",  # Room
 
     "not-all-ready": "Noch nicht bereit: {}",  # Usernames
     "all-users-ready": "Alle sind bereit ({} Nutzer)",  # Number of ready users
@@ -44,10 +44,10 @@ de = {
     "set-as-not-ready-notification": "Du bist nicht bereit",
     "autoplaying-notification": "Starte in {}...",  # Number of seconds until playback will start
 
-    "identifying-as-controller-notification": "Identifiziere als Raumleiter mit Passwort '{}'...",  # TODO: find a better translation to "room operator"
+    "identifying-as-controller-notification": "Identifiziere als Raumleiter mit Passwort „{}“...",  # TODO: find a better translation to "room operator"
     "failed-to-identify-as-controller-notification": "{} konnte sich nicht als Raumleiter identifizieren.",
     "authenticated-as-controller-notification": "{} authentifizierte sich als Raumleiter",
-    "created-controlled-room-notification": "Gesteuerten Raum '{}' mit Passwort '{}' erstellt. Bitte diese Informationen für die Zukunft aufheben!",  # RoomName, operatorPassword
+    "created-controlled-room-notification": "Gesteuerten Raum „{}“ mit Passwort „{}“ erstellt. Bitte diese Informationen für die Zukunft aufheben!",  # RoomName, operatorPassword
 
     "file-different-notification": "Deine Datei scheint sich von {}s zu unterscheiden",  # User
     "file-differences-notification": "Deine Datei unterscheidet sich auf folgende Art: {}",
@@ -62,7 +62,7 @@ de = {
     "file-played-by-notification": "Datei: {} wird gespielt von:",  # File
     "no-file-played-notification": "{} spielt keine Datei ab",  # Username
     "notplaying-notification": "Personen im Raum, die keine Dateien spielen:",
-    "userlist-room-notification":  "In Raum '{}':",  # Room
+    "userlist-room-notification":  "In Raum „{}“:",  # Room
     "userlist-file-notification": "Datei",
     "controller-userlist-userflag": "Raumleiter",
     "ready-userlist-userflag": "Bereit",
@@ -86,7 +86,7 @@ de = {
     "commandlist-notification/toggle": "\tt - Bereitschaftsanzeige umschalten",
     "commandlist-notification/create": "\tc [name] - erstelle zentral gesteuerten Raum mit dem aktuellen Raumnamen",
     "commandlist-notification/auth": "\ta [password] - authentifiziere als Raumleiter mit Passwort",
-    "commandlist-notification/chat": "\tch [message] - send a chat message in a room",  # TODO: Translate
+    "commandlist-notification/chat": "\tch [message] - Chatnachricht an einem Raum senden",
     "syncplay-version-notification": "Syncplay Version: {}",  # syncplay.version
     "more-info-notification": "Weitere Informationen auf: {}",  # projectURL
 
@@ -107,19 +107,20 @@ de = {
     "mpc-version-insufficient-error": "MPC-Version nicht ausreichend, bitte nutze `mpc-hc` >= `{}`",
     "mpc-be-version-insufficient-error": "MPC-Version nicht ausreichend, bitte nutze `mpc-be` >= `{}`",
     "mpv-version-error": "Syncplay ist nicht kompatibel mit dieser Version von mpv.  Bitte benutze eine andere Version (z.B. Git HEAD).",
+    "mpv-failed-advice": "The reason mpv cannot start may be due to the use of unsupported command line arguments or an unsupported version of mpv.", # TODO: Translate
     "player-file-open-error": "Fehler beim Öffnen der Datei durch den Player",
-    "player-path-error": "Ungültiger Player-Pfad. Supported players are: mpv, mpv.net, VLC, MPC-HC, MPC-BE and mplayer2",  # To do: Translate end
+    "player-path-error": "Ungültiger Player-Pfad. Unterstützte Player sind: mpv, mpv.net, VLC, MPC-HC, MPC-BE und mplayer2",
     "hostname-empty-error": "Hostname darf nicht leer sein",
     "empty-error": "{} darf nicht leer sein",  # Configuration
     "media-player-error": "Player-Fehler: \"{}\"",  # Error line
     "unable-import-gui-error": "Konnte die GUI-Bibliotheken nicht importieren. PySide muss installiert sein, damit die grafische Oberfläche funktioniert.",
-    "unable-import-twisted-error": "Could not import Twisted. Please install Twisted v16.4.0 or later.", #To do: translate
+    "unable-import-twisted-error": "Twisted konnte nicht importiert werden. Bitte installiere Twisted v16.4.0 oder höher",
 
     "arguments-missing-error": "Notwendige Argumente fehlen, siehe --help",
 
     "unable-to-start-client-error": "Client kann nicht gestartet werden",
 
-    "player-path-config-error": "Player-Pfad ist nicht ordnungsgemäß gesetzt. Supported players are: mpv, mpv.net, VLC, MPC-HC, MPC-BE and mplayer2.",  # To do: Translate end
+    "player-path-config-error": "Player-Pfad ist nicht ordnungsgemäß gesetzt. Unterstützte Player sind: mpv, mpv.net, VLC, MPC-HC, MPC-BE und mplayer2",
     "no-file-path-config-error": "Es muss eine Datei ausgewählt werden, bevor der Player gestartet wird.",
     "no-hostname-config-error": "Hostname darf nicht leer sein",
     "invalid-port-config-error": "Port muss gültig sein",
@@ -132,24 +133,24 @@ de = {
     "vlc-failed-noscript": "Laut VLC ist das syncplay.lua Interface-Skript nicht installiert. Auf https://syncplay.pl/LUA/ [Englisch] findest du eine Anleitung.",
 
     "vlc-failed-versioncheck": "Diese VLC-Version wird von Syncplay nicht unterstützt. Bitte nutze VLC 2.0",
-    "feature-sharedPlaylists": "shared playlists",  # used for not-supported-by-server-error # TODO: Translate
+    "feature-sharedPlaylists": "Geteilte Playlists",  # used for not-supported-by-server-error
-    "feature-chat": "chat",  # used for not-supported-by-server-error # TODO: Translate
+    "feature-chat": "Chat",  # used for not-supported-by-server-error
-    "feature-readiness": "readiness",  # used for not-supported-by-server-error # TODO: Translate
+    "feature-readiness": "Bereitschaftsstatus",  # used for not-supported-by-server-error
-    "feature-managedRooms": "managed rooms",  # used for not-supported-by-server-error # TODO: Translate
+    "feature-managedRooms": "Zentral gesteuerte Räume",  # used for not-supported-by-server-error
 
-    "not-supported-by-server-error": "Dieses Feature wird vom Server nicht unterstützt. Es wird ein Server mit Syncplay Version {}+ benötigt, aktuell verwendet wird jedoch Version {}.",  # minVersion, serverVersion
+    "not-supported-by-server-error": "Diese Funktion wird vom Server nicht unterstützt. Es wird ein Server mit Syncplay Version {}+ benötigt, aktuell verwendet wird jedoch Version {}.",  # minVersion, serverVersion
-    "shared-playlists-not-supported-by-server-error": "The shared playlists feature may not be supported by the server. To ensure that it works correctly requires a server running Syncplay  {}+, but the server is running Syncplay {}.",  # minVersion, serverVersion # TODO: Translate
+    "shared-playlists-not-supported-by-server-error": "Die Geteilte-Playlists-Funktion wird von diesem Server eventuell nicht unterstützt. Um ein korrektes Funktionieren sicherzustellen wird ein Server mit Syncplay Version {}+ benötigt, aktuell verwendet wird jedoch Version {}.",  # minVersion, serverVersion
-    "shared-playlists-disabled-by-server-error": "The shared playlist feature has been disabled in the server configuration. To use this feature you will need to connect to a different server.",  # TODO: Translate
+    "shared-playlists-disabled-by-server-error": "Die Geteilte-Playlists-Funktion wurde in der Serverkonfiguration deaktiviert. Um diese Funktion zu verwenden, musst du dich mit einem anderen Server verbinden.",
 
     "invalid-seek-value": "Ungültige Zeitangabe",
     "invalid-offset-value": "Ungültiger Offset-Wert",
 
-    "switch-file-not-found-error": "Konnte nicht zur Datei '{0}' wechseln. Syncplay looks in the specified media directories.",  # File not found, folder it was not found in # TODO: Re-translate "Syncplay sucht im Ordner der aktuellen Datei und angegebenen Medien-Verzeichnissen." to reference to checking in "current media directory"
+    "switch-file-not-found-error": "Konnte nicht zur Datei „{0}“ wechseln. Syncplay sucht im Verzeichnis der aktuellen Datei und angegebenen Medienverzeichnissen.",  # File not found, folder it was not found in
-    "folder-search-timeout-error": "The search for media in media directories was aborted as it took too long to search through '{}'. This will occur if you select a folder with too many sub-folders in your list of media folders to search through. For automatic file switching to work again please select File->Set Media Directories in the menu bar and remove this directory or replace it with an appropriate sub-folder. If the folder is actually fine then you can re-enable it by selecting File->Set Media Directories and pressing 'OK'.",  # Folder # TODO: Translate
+    "folder-search-timeout-error": "Die Suche nach Medien in den Medienverzeichnissen wurde abgebrochen, weil es zu lange gedauert hat, „{}“ zu durchsuchen. Das kann passieren, wenn du in deiner Liste der Medienverzeichnisse ein Verzeichnis mit zu vielen Unterverzeichnissen auswhälst. Damit der automatische Dateiwechsel wieder funktioniert, wähle Datei->Medienverzeichnisse auswählen in der Menüleiste und entferne dieses Verzeichnis oder ersetze es mit einem geeigneten Unterverzeichnis. Wenn das Verzeichnis in Ordnung ist, kannst du es reaktivieren, indem du Datei->Medienverzeichnisse auswählen wählst und „OK“ drückst.",  # Folder
-    "folder-search-first-file-timeout-error": "The search for media in '{}' was aborted as it took too long to access the directory. This could happen if it is a network drive or if you configure your drive to spin down after a period of inactivity. For automatic file switching to work again please go to File->Set Media Directories and either remove the directory or resolve the issue (e.g. by changing power saving settings).",  # Folder # TODO: Translate
+    "folder-search-first-file-timeout-error": "Die Suche nach Medien in den Medienverzeichnissen wurde abgebrochen, weil es zu lange gedauert hat, auf „{}“ zuzugreifen. Das kann passieren, wenn es sich dabei um ein Netzwerkgerät handelt und du eingestellt hast, dass es sich nach Inaktivität ausschaltet. Damit der automatische Dateiwechsel wieder funktioniert, wähle Datei->Medienverzeichnisse auswählen in der Menüleiste und entferne dieses Verzeichnis oder löse das Problem (z.B. indem du die Energiespareinstellungen anpasst).",  # Folder
-    "added-file-not-in-media-directory-error": "You loaded a file in '{}' which is not a known media directory. You can add this as a media directory by selecting File->Set Media Directories in the menu bar.",  # Folder # TODO: Translate
+    "added-file-not-in-media-directory-error": "Du hast eine Datei in im Verzeichnis „{}“ geladeden, welches kein bekanntes Medienverzeichnis ist. Du kannst es als Medienverzeichnis hinzufügen, indem du  Datei->Medienverzeichnisse auswählen in der Menüleiste wählst.",  # Folder
-    "no-media-directories-error": "No media directories have been set. For shared playlist and file switching features to work properly please select File->Set Media Directories and specify where Syncplay should look to find media files.",  # TODO: Translate
+    "no-media-directories-error": "Es wurden keine Medienverzeichnisse ausgewählt. Damit geteilte Playlists und Dateiwechsel korrekt funktionieren, wähle Datei->Medienverzeichnisse auswählen in der Menüleiste und gib an, wo Syncplay nach Mediendateien suchen soll.",
-    "cannot-find-directory-error": "Could not find media directory '{}'. To update your list of media directories please select File->Set Media Directories from the menu bar and specify where Syncplay should look to find media files.",  # TODO: Translate
+    "cannot-find-directory-error": "Das Medienverzeichnis „{}“ konnte nicht gefunden werden. Um deine Liste an Medienverzeichnissen anzupassen, wähle Datei->Medienverzeichnisse auswählen in der Menüleiste und gib an, wo Syncplay nach Mediendateien suchen soll.",
 
     "failed-to-load-server-list-error": "Konnte die Liste der öffentlichen Server nicht laden. Bitte besuche https://www.syncplay.pl/ [Englisch] mit deinem Browser.",
 
@@ -168,13 +169,15 @@ de = {
     "file-argument": 'Abzuspielende Datei',
     "args-argument": 'Player-Einstellungen; Wenn du Einstellungen, die mit - beginnen, nutzen willst, stelle ein einzelnes \'--\'-Argument davor',
     "clear-gui-data-argument": 'Setzt die Pfad- und GUI-Fenster-Daten die in den QSettings gespeichert sind zurück',
-    "language-argument": 'Sprache für Syncplay-Nachrichten (de/en/ru/it/es)',
+    "language-argument": 'Sprache für Syncplay-Nachrichten (de/en/ru/it/es/pt_BR)',
 
     "version-argument": 'gibt die aktuelle Version aus',
     "version-message": "Du verwendest Syncplay v. {} ({})",
 
+    "load-playlist-from-file-argument": "lädt eine Playlist aus einer Textdatei (ein Eintrag pro Zeile)",
+
     # Client labels
-    "config-window-title": "Syncplay Konfiguration",
+    "config-window-title": "Syncplay-Konfiguration",
 
     "connection-group-title": "Verbindungseinstellungen",
     "host-label": "Server-Adresse:",
@@ -184,7 +187,7 @@ de = {
 
     "media-setting-title": "Media-Player Einstellungen",
     "executable-path-label": "Pfad zum Media-Player:",
-    "media-path-label": "Pfad zur Datei:",  # Todo: Translate to 'Path to video (optional)'
+    "media-path-label": "Pfad zum Video (optional):",
     "player-arguments-label": "Playerparameter:",
     "browse-label": "Durchsuchen",
     "update-server-list-label": "Liste aktualisieren",
@@ -200,10 +203,10 @@ de = {
     "checkforupdatesautomatically-label": "Automatisch nach Updates suchen",
     "slowondesync-label": "Verlangsamen wenn nicht synchron (nicht unterstützt mit MPC-HC/BE)",
     "dontslowdownwithme-label": "Nie verlangsamen oder andere zurückspulen (Experimentell)",
-    "pausing-title": "Pausing",  # TODO: Translate
+    "pausing-title": "Pausiere",
     "pauseonleave-label": "Pausieren wenn ein Benutzer austritt",
-    "readiness-title": "Initial readiness state",  # TODO: Translate
+    "readiness-title": "Anfänglicher Bereitschaftsstatus",
-    "readyatstart-label": "Standardmäßig auf \'Bereit\' stellen",
+    "readyatstart-label": "Standardmäßig auf „Bereit“ stellen",
     "forceguiprompt-label": "Diesen Dialog nicht mehr anzeigen",
     "showosd-label": "OSD-Nachrichten anzeigen",
 
@@ -228,7 +231,7 @@ de = {
     "messages-label": "Nachrichten",
     "messages-osd-title": "OSD-(OnScreenDisplay)-Einstellungen",
     "messages-other-title": "Weitere Display-Einstellungen",
-    "chat-label": "Chat",  # TODO: Translate
+    "chat-label": "Chat",
     "privacy-label": "Privatsphäre",
     "privacy-title": "Privatsphäreneinstellungen",
     "unpause-title": "Wenn du Play drückst, auf Bereit setzen und:",
@@ -236,36 +239,36 @@ de = {
     "unpause-ifothersready-option": "Wiedergeben wenn bereits als Bereit gesetzt oder alle anderen bereit sind (Standard)",
     "unpause-ifminusersready-option": "Wiedergeben wenn bereits als Bereit gesetzt oder die minimale Anzahl anderer Nutzer bereit ist",
     "unpause-always": "Immer wiedergeben",
-    "syncplay-trusteddomains-title": "Trusted domains (for streaming services and hosted content)",  # TODO: Translate into German
+    "syncplay-trusteddomains-title": "Vertrauenswürdige Domains (für Streamingdienste und gehostete Inhalte)",
 
-    "chat-title": "Chat message input",  # TODO: Translate
+    "chat-title": "Chatnachrichten-Eingabe",
-    "chatinputenabled-label": "Enable chat input via mpv (using enter key)",  # TODO: Translate
+    "chatinputenabled-label": "Chateingabe via mpv erlauben (mit der Entertaste)",
-    "chatdirectinput-label": "Allow instant chat input (bypass having to press enter key to chat)",  # TODO: Translate
+    "chatdirectinput-label": "Sofotige Chateingabe erlauben (ohne die Entertaste zu drücken)",
-    "chatinputfont-label": "Chat input font",  # TODO: Translate
+    "chatinputfont-label": "Chateingabe-Schriftart",
-    "chatfont-label": "Set font",  # TODO: Translate
+    "chatfont-label": "Schriftart wählen",
-    "chatcolour-label": "Set colour",  # TODO: Translate
+    "chatcolour-label": "Farbe wählen",
-    "chatinputposition-label": "Position of message input area in mpv",  # TODO: Translate
+    "chatinputposition-label": "Position des Nachrichteneingabe-Felds in mpv",
-    "chat-top-option": "Top",  # TODO: Translate
+    "chat-top-option": "Oben",
-    "chat-middle-option": "Middle",  # TODO: Translate
+    "chat-middle-option": "Mitte",
-    "chat-bottom-option": "Bottom",  # TODO: Translate
+    "chat-bottom-option": "Unten",
-    "chatoutputheader-label": "Chat message output",  # TODO: Translate
+    "chatoutputheader-label": "Chatnachrichten-Eingabe",
-    "chatoutputfont-label": "Chat output font",  # TODO: Translate
+    "chatoutputfont-label": "Chateingabe-Schriftart",
-    "chatoutputenabled-label": "Enable chat output in media player (mpv only for now)",  # TODO: Translate
+    "chatoutputenabled-label": "Chatausgabe im Medienplayer aktivieren (bisher nur mpv)",
-    "chatoutputposition-label": "Output mode",  # TODO: Translate
+    "chatoutputposition-label": "Ausgabemodus",
-    "chat-chatroom-option": "Chatroom style",  # TODO: Translate
+    "chat-chatroom-option": "Chatroom-Stil",
-    "chat-scrolling-option": "Scrolling style",  # TODO: Translate
+    "chat-scrolling-option": "Scrolling-Stil",
 
-    "mpv-key-tab-hint": "[TAB] to toggle access to alphabet row key shortcuts.",  # TODO: Translate
+    "mpv-key-tab-hint": "[TAB] um Zugriff auf die Buchstabentastenkürzel ein-/auszuschalten.",
-    "mpv-key-hint": "[ENTER] to send message. [ESC] to escape chat mode.",  # TODO: Translate
+    "mpv-key-hint": "[ENTER] um eine Nachricht zu senden. [ESC] um den Chatmodus zu verlassen.",
-    "alphakey-mode-warning-first-line": "You can temporarily use old mpv bindings with a-z keys.",  # TODO: Translate
+    "alphakey-mode-warning-first-line": "Du kannst vorübergehend die alten mpv-Tastaturkürzel mit den a–z-Tasten verwenden.",
-    "alphakey-mode-warning-second-line": "Press [TAB] to return to Syncplay chat mode.",  # TODO: Translate
+    "alphakey-mode-warning-second-line": "Drücke [TAB], um in den Syncplay-Chatmodus zurückzukehren.",
 
     "help-label": "Hilfe",
-    "reset-label": "Standardwerte zurücksetzen",
+    "reset-label": "Auf Standardwerte zurücksetzen",
     "run-label": "Syncplay starten",
     "storeandrun-label": "Konfiguration speichern und Syncplay starten",
 
-    "contact-label": "Du hast eine Idee, einen Bug gefunden oder möchtest Feedback geben? Sende eine E-Mail an <a href=\"mailto:dev@syncplay.pl\">dev@syncplay.pl</a>, chatte auf dem <a href=\"https://webchat.freenode.net/?channels=#syncplay\">#Syncplay IRC-Kanal</a> auf irc.freenode.net oder <a href=\"https://github.com/Uriziel/syncplay/issues\">öffne eine Fehlermeldung auf GitHub</a>. Außerdem findest du auf <a href=\"https://syncplay.pl/\">https://syncplay.pl/</a> weitere Informationen, Hilfestellungen und Updates.  OTE: Chat messages are not encrypted so do not use Syncplay to send sensitive information.",  # TODO: Translate  last sentence
+    "contact-label": "Du hast eine Idee, einen Bug gefunden oder möchtest Feedback geben? Sende eine E-Mail an <a href=\"mailto:dev@syncplay.pl\">dev@syncplay.pl</a>, chatte auf dem <a href=\"https://webchat.freenode.net/?channels=#syncplay\">#Syncplay IRC-Kanal</a> auf irc.freenode.net oder <a href=\"https://github.com/Uriziel/syncplay/issues\">öffne eine Fehlermeldung auf GitHub</a>. Außerdem findest du auf <a href=\"https://syncplay.pl/\">https://syncplay.pl/</a> weitere Informationen, Hilfestellungen und Updates. Chatnachrichten sind nicht verschlüsselt, also verwende Syncplay nicht, um sensible Daten zu verschicken.",
 
     "joinroom-label": "Raum beitreten",
     "joinroom-menu-label": "Raum beitreten {}",  # TODO: Might want to fix this
@@ -278,9 +281,9 @@ de = {
     "autoplay-guipushbuttonlabel": "Automatisch abspielen wenn alle bereit sind",
     "autoplay-minimum-label": "Minimum an Nutzern:",
 
-    "sendmessage-label": "Send",  # TODO: Translate
+    "sendmessage-label": "Senden",
 
-    "ready-guipushbuttonlabel": "Ich bin bereit den Film anzuschauen!",
+    "ready-guipushbuttonlabel": "Ich bin bereit zum Gucken!",
 
     "roomuser-heading-label": "Raum / Benutzer",
     "size-heading-label": "Größe",
@@ -294,15 +297,17 @@ de = {
     "file-menu-label": "&Datei",  # & precedes shortcut key
     "openmedia-menu-label": "&Mediendatei öffnen...",
     "openstreamurl-menu-label": "&Stream URL öffnen",
-    "setmediadirectories-menu-label": "Set media &directories",  # TODO: Translate
+    "setmediadirectories-menu-label": "Medienverzeichnisse &auswählen",
+    "loadplaylistfromfile-menu-label": "&Lade Playlist aus Datei",
+    "saveplaylisttofile-menu-label": "&Speichere Playlist in Datei",
     "exit-menu-label": "&Beenden",
     "advanced-menu-label": "&Erweitert",
     "window-menu-label": "&Fenster",
     "setoffset-menu-label": "&Offset einstellen",
     "createcontrolledroom-menu-label": "&Zentral gesteuerten Raum erstellen",
     "identifyascontroller-menu-label": "Als Raumleiter &identifizieren",
-    "settrusteddomains-menu-label": "Set &trusted domains",  # TODO: Translate
+    "settrusteddomains-menu-label": "&Vertrauenswürdige Domains auswählen",
-    "addtrusteddomain-menu-label": "Add {} as trusted domain",  # Domain # TODO: Translate
+    "addtrusteddomain-menu-label": "{} als vertrauenswürdige Domain hinzufügen",  # Domain
 
     "edit-menu-label": "&Bearbeiten",
     "cut-menu-label": "Aus&schneiden",
@@ -316,40 +321,40 @@ de = {
     "userguide-menu-label": "&Benutzerhandbuch öffnen",
     "update-menu-label": "auf &Aktualisierung prüfen",
 
-    # startTLS messages - TODO: Translate
+    # startTLS messages
-    "startTLS-initiated": "Attempting secure connection",
+    "startTLS-initiated": "Sichere Verbindung wird versucht",
-    "startTLS-secure-connection-ok": "Secure connection established ({})",
+    "startTLS-secure-connection-ok": "Sichere Verbindung hergestellt ({})",
-    "startTLS-server-certificate-invalid": 'Secure connection failed. The server uses an invalid security certificate. This communication could be intercepted by a third party. For further details and troubleshooting see <a href="https://syncplay.pl/trouble">here</a>.',
+    "startTLS-server-certificate-invalid": 'Sichere Verbindung fehlgeschlagen. Der Server benutzt ein ungültiges Sicherheitszertifikat. Der Kanal könnte von Dritten abgehört werden. Für weitere Details und Problemlösung siehe <a href="https://syncplay.pl/trouble">hier</a> [Englisch].',
-    "startTLS-server-certificate-invalid-DNS-ID": "Syncplay does not trust this server because it uses a certificate that is not valid for its hostname.",
+    "startTLS-server-certificate-invalid-DNS-ID": "Syncplay does not trust this server because it uses a certificate that is not valid for its hostname.", # TODO: Translate
-    "startTLS-not-supported-client": "This client does not support TLS",
+    "startTLS-not-supported-client": "Dieser Server unterstützt kein TLS",
-    "startTLS-not-supported-server": "This server does not support TLS",
+    "startTLS-not-supported-server": "Dieser Server unterstützt kein TLS",
 
-    # TLS certificate dialog - TODO: Translate
+    # TLS certificate dialog
-    "tls-information-title": "Certificate Details",
+    "tls-information-title": "Zertifikatdetails",
-    "tls-dialog-status-label": "<strong>Syncplay is using an encrypted connection to {}.</strong>",
+    "tls-dialog-status-label": "<strong>Syncplay nutzt eine verschlüsselte Verbindung zu {}.</strong>",
-    "tls-dialog-desc-label": "Encryption with a digital certificate keeps information private as it is sent to or from the<br/>server {}.",
+    "tls-dialog-desc-label": "Verschlüsselung mit einem digitalen Zertifikat hält Informationen geheim, die vom Server {} gesendet oder empfangen werden.",
-    "tls-dialog-connection-label": "Information encrypted using Transport Layer Security (TLS), version {} with the cipher<br/>suite: {}.",
+    "tls-dialog-connection-label": "Daten werden verschlüsselt mit Transport Layer Security (TLS) Version {} und <br/>folgender Chiffre: {}.",
-    "tls-dialog-certificate-label": "Certificate issued by {} valid until {}.",
+    "tls-dialog-certificate-label": "Zertifikat ausgestellt durch {} gültig bis {}.",
 
-    # About dialog - TODO: Translate
+    # About dialog
-    "about-menu-label": "&About Syncplay",
+    "about-menu-label": "&Über Syncplay",
-    "about-dialog-title": "About Syncplay",
+    "about-dialog-title": "Über Syncplay",
-    "about-dialog-release": "Version {} release {}",
+    "about-dialog-release": "Version {} Release {}",
-    "about-dialog-license-text": "Licensed under the Apache&nbsp;License,&nbsp;Version 2.0",
+    "about-dialog-license-text": "Lizensiert unter der Apache-Lizenz&nbsp;Version 2.0",
-    "about-dialog-license-button": "License",
+    "about-dialog-license-button": "Lizenz",
-    "about-dialog-dependencies": "Dependencies",
+    "about-dialog-dependencies": "Abhängigkeiten",
 
     "setoffset-msgbox-label": "Offset einstellen",
     "offsetinfo-msgbox-label": "Offset (siehe https://syncplay.pl/guide/ für eine Anleitung [Englisch]):",
 
-    "promptforstreamurl-msgbox-label": "Stream URL öffnen",
+    "promptforstreamurl-msgbox-label": "Stream-URL öffnen",
-    "promptforstreamurlinfo-msgbox-label": "Stream URL",
+    "promptforstreamurlinfo-msgbox-label": "Stream-URL",
 
-    "addfolder-label": "Add folder",  # TODO: Translate
+    "addfolder-label": "Verzeichnis hinzufügen",
 
-    "adduris-msgbox-label": "Add URLs to playlist (one per line)",  # TODO: Translate
+    "adduris-msgbox-label": "URLs zur Playlist hinzufügen (ein Eintrag pro Zeile)",
-    "editplaylist-msgbox-label": "Set playlist (one per line)",  # TODO: Translate
+    "editplaylist-msgbox-label": "Playlist auswählen (ein Eintrag pro Zeile)",
-    "trusteddomains-msgbox-label": "Domains it is okay to automatically switch to (one per line)",  # TODO: Translate
+    "trusteddomains-msgbox-label": "Domains, zu denen automatisch gewechselt werden darf (ein Eintrag pro Zeile)",
 
     "createcontrolledroom-msgbox-label": "Zentral gesteuerten Raum erstellen",
     "controlledroominfo-msgbox-label": "Namen des zentral gesteuerten Raums eingeben\r\n(siehe https://syncplay.pl/guide/ für eine Anleitung [Englisch]):",
@@ -369,9 +374,9 @@ de = {
     "room-tooltip": "Der Raum, der betreten werden soll, kann ein x-beliebiger sein. Allerdings werden nur Clients im selben Raum synchronisiert.",
 
     "executable-path-tooltip": "Pfad zum ausgewählten, unterstützten Mediaplayer (MPC-HC, MPC-BE, VLC, mplayer2 or mpv).",
-    "media-path-tooltip": "Pfad zum wiederzugebenden Video oder Stream. Notwendig für mplayer2.",  # TODO: Confirm translation
+    "media-path-tooltip": "Pfad zum wiederzugebenden Video oder Stream. Notwendig für mplayer2.",
-    "player-arguments-tooltip": "Zusätzliche Kommandozeilenparameter / -schalter für diesen Mediaplayer.",
+    "player-arguments-tooltip": "Zusätzliche Kommandozeilenparameter/-schalter für diesen Mediaplayer.",
-    "mediasearcdirectories-arguments-tooltip": "Verzeichnisse, in denen Syncplay nach Mediendateien suchen soll, z.B. wenn du das Click-to-switch-Feature verwendest. Syncplay wird rekursiv Unterordner durchsuchen.",  # TODO: Translate Click-to-switch? (or use as name for feature)
+    "mediasearcdirectories-arguments-tooltip": "Verzeichnisse, in denen Syncplay nach Mediendateien suchen soll, z.B. wenn du die Click-to-switch-Funktion verwendest. Syncplay wird Unterverzeichnisse rekursiv durchsuchen.",  # TODO: Translate Click-to-switch? (or use as name for feature)
 
     "more-tooltip": "Weitere Einstellungen anzeigen.",
     "filename-privacy-tooltip": "Privatheitsmodus beim Senden des Namens der aktuellen Datei zum Server.",
@@ -385,11 +390,11 @@ de = {
     "fastforwardondesync-label": "Vorspulen wenn das Video laggt (empfohlen)",
     "dontslowdownwithme-tooltip": "Lässt andere nicht langsamer werden oder zurückspringen, wenn deine Wiedergabe hängt.",
     "pauseonleave-tooltip": "Wiedergabe anhalten, wenn deine Verbindung verloren geht oder jemand den Raum verlässt.",
-    "readyatstart-tooltip": "Zu Beginn auf 'Bereit' setzen (sonst bist du als 'Nicht Bereit' gesetzt, bis du den Status änderst)",
+    "readyatstart-tooltip": "Zu Beginn auf „Bereit“ setzen (sonst bist du als „Nicht Bereit“ gesetzt, bis du den Status änderst)",
     "forceguiprompt-tooltip": "Der Konfigurationsdialog wird nicht angezeigt, wenn eine Datei mit Syncplay geöffnet wird.",
     "nostore-tooltip": "Syncplay mit den angegebenen Einstellungen starten, diese aber nicht dauerhaft speichern.",
     "rewindondesync-tooltip": "Zum Wiederherstellen der Synchronität in der Zeit zurückspringen (empfohlen)",
-    "fastforwardondesync-tooltip": "Nach vorne springen, wenn asynchron zum Raumleiter (oder deine vorgetäuschte Position, falls 'Niemals verlangsamen oder andere zurückspulen' aktiviert ist).",
+    "fastforwardondesync-tooltip": "Nach vorne springen, wenn asynchron zum Raumleiter (oder deine vorgetäuschte Position, falls „Niemals verlangsamen oder andere zurückspulen“ aktiviert ist).",
     "showosd-tooltip": "Syncplay-Nachrichten auf dem OSD (= OnScreenDisplay, ein eingeblendetes Textfeld) des Players anzeigen.",
     "showosdwarnings-tooltip": "Warnungen bei Unterschiedlichen Dateien oder Alleinsein im Raum anzeigen.",
     "showsameroomosd-tooltip": "OSD-Meldungen über Ereignisse im selben Raum anzeigen.",
@@ -402,36 +407,36 @@ de = {
     "unpause-ifalreadyready-tooltip": "Wenn du nicht bereit bist und Play drückst wirst du als bereit gesetzt - zum Starten der Wiedergabe nochmal drücken.",
     "unpause-ifothersready-tooltip": "Wenn du Play drückst und nicht bereit bist, wird nur gestartet, wenn alle anderen bereit sind.",
     "unpause-ifminusersready-tooltip": "Wenn du Play drückst und nicht bereit bist, wird nur gestartet, wenn die minimale Anzahl anderer Benutzer bereit ist.",
-    "trusteddomains-arguments-tooltip": "Domains that it is okay for Syncplay to automatically switch to when shared playlists is enabled.",  # TODO: Translate into German
+    "trusteddomains-arguments-tooltip": "Domains, zu denen Syncplay automatisch wechself darf, wenn geteilte Playlists aktiviert sind.",
 
-    "chatinputenabled-tooltip": "Enable chat input in mpv (press enter to chat, enter to send, escape to cancel)",  # TODO: Translate
+    "chatinputenabled-tooltip": "Chateingabe in mpv aktivieren (Drücke Enter zum Chatten, Enter zum Senden, Esc um abzubrechen)",
-    "chatdirectinput-tooltip": "Skip having to press 'enter' to go into chat input mode in mpv. Press TAB in mpv to temporarily disable this feature.",  # TODO: Translate
+    "chatdirectinput-tooltip": "Überspringe, Enter drücken zu müssen, um in mpv in den Chatmodus zu gelangen. Drücke TAB, um diese Funktion vorübergehend zu deaktivieren.",
-    "font-label-tooltip": "Font used for when entering chat messages in mpv. Client-side only, so doesn't affect what other see.",  # TODO: Translate
+    "font-label-tooltip": "Schriftart für die Darstellung der Chateingabe in mpv. Nur clientseitig, beeinflusst also nicht, was andere sehen.",
-    "set-input-font-tooltip": "Font family used for when entering chat messages in mpv. Client-side only, so doesn't affect what other see.",  # TODO: Translate
+    "set-input-font-tooltip": "Schriftfamilie für die Darstellung der Chateingabe in mpv. Nur clientseitig, beeinflusst also nicht, was andere sehen.",
-    "set-input-colour-tooltip": "Font colour used for when entering chat messages in mpv. Client-side only, so doesn't affect what other see.",  # TODO: Translate
+    "set-input-colour-tooltip": "Schriftfarbe für die Darstellung der Chateingabe in mpv. Nur clientseitig, beeinflusst also nicht, was andere sehen.",
-    "chatinputposition-tooltip": "Location in mpv where chat input text will appear when you press enter and type.",  # TODO: Translate
+    "chatinputposition-tooltip": "Position in mpv, an der Text der Chateingabe erscheint, wenn du Enter drückst und tippst.",
-    "chatinputposition-top-tooltip": "Place chat input at top of mpv window.",  # TODO: Translate
+    "chatinputposition-top-tooltip": "Chateingabe oben im mpv-Fenster platzieren.",
-    "chatinputposition-middle-tooltip": "Place chat input in dead centre of mpv window.",  # TODO: Translate
+    "chatinputposition-middle-tooltip": "Chateingabe mittig im mpv-Fenster platzieren.",
-    "chatinputposition-bottom-tooltip": "Place chat input at bottom of mpv window.",  # TODO: Translate
+    "chatinputposition-bottom-tooltip": "Chateingabe unten im mpv-Fenster platzieren.",
-    "chatoutputenabled-tooltip": "Show chat messages in OSD (if supported by media player).",  # TODO: Translate
+    "chatoutputenabled-tooltip": "Chatnachrichten im OSD anzeigen (sofern vom Medienplayer unterstützt).",
-    "font-output-label-tooltip": "Chat output font.",  # TODO: Translate
+    "font-output-label-tooltip": "Chatausgabe-Schriftart.",
-    "set-output-font-tooltip": "Font used for when displaying chat messages.",  # TODO: Translate
+    "set-output-font-tooltip": "Schriftart für die Darstellung von Chatnachrichten.",
-    "chatoutputmode-tooltip": "How chat messages are displayed.",  # TODO: Translate
+    "chatoutputmode-tooltip": "Wie Chatnachrichten dargestellt werden.",
-    "chatoutputmode-chatroom-tooltip": "Display new lines of chat directly below previous line.",  # TODO: Translate
+    "chatoutputmode-chatroom-tooltip": "Neue Chatzeilen unmittelbar unterder vorangehenden Zeile anzeigen.",
-    "chatoutputmode-scrolling-tooltip": "Scroll chat text from right to left.",  # TODO: Translate
+    "chatoutputmode-scrolling-tooltip": "Chat-Text von rechts nach links scrollen lassen",
 
     "help-tooltip": "Öffnet Hilfe auf syncplay.pl [Englisch]",
     "reset-tooltip": "Alle Einstellungen auf Standardwerte zurücksetzen.",
     "update-server-list-tooltip": "Mit syncplay.pl verbinden um die Liste öffentlicher Server zu aktualisieren.",
 
-    "sslconnection-tooltip": "Securely connected to server. Click for certificate details.",  # TODO: Translate
+    "sslconnection-tooltip": "Sicher mit Server verbunden. Klicken, um Zertifikatdetails anzuzeigen.",
 
     "joinroom-tooltip": "Den aktuellen Raum verlassen und stattdessen den angegebenen betreten.",
     "seektime-msgbox-label": "Springe zur angegebenen Zeit (in Sekunden oder min:sek).  Verwende +/- zum relativen Springen.",
     "ready-tooltip": "Zeigt an, ob du bereit zum anschauen bist",
     "autoplay-tooltip": "Automatisch abspielen, wenn alle Nutzer bereit sind oder die minimale Nutzerzahl erreicht ist.",
     "switch-to-file-tooltip": "Doppelklicken um zu {} zu wechseln",  # Filename
-    "sendmessage-tooltip": "Send message to room",  # TODO: Translate
+    "sendmessage-tooltip": "Nachricht an Raum senden",
 
     # In-userlist notes (GUI)
     "differentsize-note": "Verschiedene Größe!",
@@ -444,7 +449,7 @@ de = {
 
     # Server notifications
     "welcome-server-notification": "Willkommen zum Syncplay-Server, v. {0}",  # version
-    "client-connected-room-server-notification": "{0}({2}) hat den Raum '{1}' betreten",  # username, host, room
+    "client-connected-room-server-notification": "{0}({2}) hat den Raum „{1}“ betreten",  # username, host, room
     "client-left-server-notification": "{0} hat den Server verlassen",  # name
     "no-salt-notification": "WICHTIGER HINWEIS: Damit von dem Server generierte Passwörter für geführte Räume auch nach einem Serverneustart funktionieren, starte den Server mit dem folgenden Parameter: --salt {}",  # Salt
 
@@ -452,52 +457,52 @@ de = {
     "server-argument-description": 'Anwendung, um mehrere MPlayer, MPC-HC/BE und VLC-Instanzen über das Internet zu synchronisieren. Server',
     "server-argument-epilog": 'Wenn keine Optionen angegeben sind, werden die _config-Werte verwendet',
     "server-port-argument": 'Server TCP-Port',
-    "server-password-argument": 'Server Passwort',
+    "server-password-argument": 'Server-Passwort',
     "server-isolate-room-argument": 'Sollen die Räume isoliert sein?',
     "server-salt-argument": "zufällige Zeichenkette, die zur Erstellung von Passwörtern verwendet wird",
     "server-disable-ready-argument": "Bereitschaftsfeature deaktivieren",
     "server-motd-argument": "Pfad zur Datei, von der die Nachricht des Tages geladen wird",
-    "server-chat-argument": "Should chat be disabled?",  # TODO: Translate
+    "server-chat-argument": "Soll Chat deaktiviert werden?",
-    "server-chat-maxchars-argument": "Maximum number of characters in a chat message (default is {})",  # TODO: Translate
+    "server-chat-maxchars-argument": "Maximale Zeichenzahl in einer Chatnachricht (Standard ist {})",
-    "server-maxusernamelength-argument": "Maximum number of characters in a username (default is {})", # TODO: Translate
+    "server-maxusernamelength-argument": "Maximale Zeichenzahl in einem Benutzernamen (Standard ist {})",
-    "server-stats-db-file-argument": "Enable server stats using the SQLite db file provided", # TODO: Translate
+    "server-stats-db-file-argument": "Aktiviere Server-Statistiken mithilfe der bereitgestellten SQLite-db-Datei",
-    "server-startTLS-argument": "Enable TLS connections using the certificate files in the path provided", # TODO: Translate
+    "server-startTLS-argument": "Erlaube TLS-Verbindungen mit den Zertifikatdateien im Angegebenen Pfad",
     "server-messed-up-motd-unescaped-placeholders": "Die Nachricht des Tages hat unmaskierte Platzhalter. Alle $-Zeichen sollten verdoppelt werden ($$).",
     "server-messed-up-motd-too-long": "Die Nachricht des Tages ist zu lang - Maximal {} Zeichen, aktuell {}.",
 
     # Server errors
     "unknown-command-server-error": "Unbekannter Befehl {}",  # message
     "not-json-server-error": "Kein JSON-String {}",  # message
-    "line-decode-server-error": "Not a utf-8 string",  # TODO: Translate
+    "line-decode-server-error": "Keine utf-8-Zeichenkette",
     "not-known-server-error": "Der Server muss dich kennen, bevor du diesen Befehl nutzen kannst",
     "client-drop-server-error": "Client verloren: {} -- {}",  # host, error
     "password-required-server-error": "Passwort nötig",
     "wrong-password-server-error": "Ungültiges Passwort",
     "hello-server-error": "Zu wenige Hello-Argumente",
 
-    # Playlists TODO: Translate all this to German
+    # Playlists
-    "playlist-selection-changed-notification":  "{} changed the playlist selection",  # Username
+    "playlist-selection-changed-notification":  "{} hat die Playlist-Auswahl geändert",  # Username
-    "playlist-contents-changed-notification": "{} updated the playlist",  # Username
+    "playlist-contents-changed-notification": "{} hat die Playlist aktualisiert",  # Username
-    "cannot-find-file-for-playlist-switch-error": "Could not find file {} in media directories for playlist switch!",  # Filename
+    "cannot-find-file-for-playlist-switch-error": "Die Datei {} konnte zum Dateiwechsel nicht in den Medienverzeichnissen gefunden werden!",  # Filename
-    "cannot-add-duplicate-error": "Could not add second entry for '{}' to the playlist as no duplicates are allowed.",  # Filename
+    "cannot-add-duplicate-error": "Konnte zweiten Eintrag für „{}“ nicht zur Playlist hinzufügen, weil Dubletten nicht erlaubt sind.",  # Filename
-    "cannot-add-unsafe-path-error": "Could not automatically load {} because it is not on a trusted domain. You can switch to the URL manually by double clicking it in the playlist, and add trusted domains via File->Advanced->Set Trusted Domains. If you right click on a URL then you can add its domain as a trusted domain via the context menu.",  # Filename
+    "cannot-add-unsafe-path-error": "{} konnte nicht automatisch geladen werden, weil es sich nicht um eine vertrauenswürdige Domain handelt. Du kannst manuell zu der URL wechseln, indem du sie in der Playlist doppelklickst oder vertrauenswürdige Domains unter Datei->Erweitert->Vertrauenswürdige Domains auswählen hinzufügst. Wenn du einen Rechtsklick auf eine URL ausführst, kannst du ihre Domain im Kontextmenü als vertrauenswürdig hinzufügen.",  # Filename
-    "sharedplaylistenabled-label": "Enable shared playlists",
+    "sharedplaylistenabled-label": "Geteilte Playlists aktivieren",
-    "removefromplaylist-menu-label": "Remove from playlist",
+    "removefromplaylist-menu-label": "Von Playlist entfernen",
-    "shuffleremainingplaylist-menu-label": "Shuffle remaining playlist",
+    "shuffleremainingplaylist-menu-label": "Verbleibende Playlist shuffeln",
-    "shuffleentireplaylist-menu-label": "Shuffle entire playlist",
+    "shuffleentireplaylist-menu-label": "Gesamte Playlist shuffeln",
-    "undoplaylist-menu-label": "Undo last change to playlist",
+    "undoplaylist-menu-label": "Letze Playlist-Änderung rückgängig machen",
-    "addfilestoplaylist-menu-label": "Add file(s) to bottom of playlist",
+    "addfilestoplaylist-menu-label": "Datei(en) zum Ende der Playlist hinzufügen",
-    "addurlstoplaylist-menu-label": "Add URL(s) to bottom of playlist",
+    "addurlstoplaylist-menu-label": "URL(s) zum Ende der Playlist hinzufügen",
-    "editplaylist-menu-label": "Edit playlist",
+    "editplaylist-menu-label": "Playlist bearbeiten",
 
-    "open-containing-folder": "Open folder containing this file",
+    "open-containing-folder": "Übergeordnetes Verzeichnis der Datei öffnen",
-    "addyourfiletoplaylist-menu-label": "Add your file to playlist",
+    "addyourfiletoplaylist-menu-label": "Deine Datei zur Playlist hinzufügen",
-    "addotherusersfiletoplaylist-menu-label": "Add {}'s file to playlist",  # [Username]
+    "addotherusersfiletoplaylist-menu-label": "{}s Datei zur Playlist hinzufügen",  # [Username]
-    "addyourstreamstoplaylist-menu-label": "Add your stream to playlist",
+    "addyourstreamstoplaylist-menu-label": "Deinen Stream zur Playlist hinzufügen",
-    "addotherusersstreamstoplaylist-menu-label": "Add {}' stream to playlist",  # [Username]
+    "addotherusersstreamstoplaylist-menu-label": "{}s Stream zur Playlist hinzufügen",  # [Username]
-    "openusersstream-menu-label": "Open {}'s stream",  # [username]'s
+    "openusersstream-menu-label": "{}s Stream öffnen",  # [username]'s
-    "openusersfile-menu-label": "Open {}'s file",  # [username]'s
+    "openusersfile-menu-label": "{}s Datei öffnen",  # [username]'s
 
-    "playlist-instruction-item-message": "Drag file here to add it to the shared playlist.",
+    "playlist-instruction-item-message": "Zieh eine Datei hierher, um sie zur geteilten Playlist hinzuzufügen.",
-    "sharedplaylistenabled-tooltip": "Room operators can add files to a synced playlist to make it easy for everyone to watching the same thing. Configure media directories under 'Misc'.",
+    "sharedplaylistenabled-tooltip": "Raumleiter können Dateien zu einer geteilten Playlist hinzufügen und es so erleichtern, gemeinsam das Gleiche zu gucken. Konfiguriere Medienverzeichnisse unter „Diverse“",
 }

syncplay/messages_en.py

@@ -107,6 +107,7 @@ en = {
     "mpc-version-insufficient-error": "MPC version not sufficient, please use `mpc-hc` >= `{}`",
     "mpc-be-version-insufficient-error": "MPC version not sufficient, please use `mpc-be` >= `{}`",
     "mpv-version-error": "Syncplay is not compatible with this version of mpv. Please use a different version of mpv (e.g. Git HEAD).",
+    "mpv-failed-advice": "The reason mpv cannot start may be due to the use of unsupported command line arguments or an unsupported version of mpv.",
     "player-file-open-error": "Player failed opening file",
     "player-path-error": "Player path is not set properly. Supported players are: mpv, mpv.net, VLC, MPC-HC, MPC-BE and mplayer2",
     "hostname-empty-error": "Hostname can't be empty",
@@ -168,11 +169,13 @@ en = {
     "file-argument": 'file to play',
     "args-argument": 'player options, if you need to pass options starting with - prepend them with single \'--\' argument',
     "clear-gui-data-argument": 'resets path and window state GUI data stored as QSettings',
-    "language-argument": 'language for Syncplay messages (de/en/ru/it/es)',
+    "language-argument": 'language for Syncplay messages (de/en/ru/it/es/pt_BR)',
 
     "version-argument": 'prints your version',
     "version-message": "You're using Syncplay version {} ({})",
 
+    "load-playlist-from-file-argument": "loads playlist from text file (one entry per line)",
+
     # Client labels
     "config-window-title": "Syncplay configuration",
 
@@ -297,6 +300,8 @@ en = {
     "openmedia-menu-label": "&Open media file",
     "openstreamurl-menu-label": "Open &media stream URL",
     "setmediadirectories-menu-label": "Set media &directories",
+    "loadplaylistfromfile-menu-label": "&Load playlist from file",
+    "saveplaylisttofile-menu-label": "&Save playlist to file",
     "exit-menu-label": "E&xit",
     "advanced-menu-label": "&Advanced",
     "window-menu-label": "&Window",

syncplay/messages_es.py

@@ -107,6 +107,7 @@ es = {
     "mpc-version-insufficient-error": "La versión de MPC no es suficiente, por favor utiliza `mpc-hc` >= `{}`",
     "mpc-be-version-insufficient-error": "La versión de MPC no es suficiente, por favor utiliza `mpc-be` >= `{}`",
     "mpv-version-error": "Syncplay no es compatible con esta versión de mpv. Por favor utiliza una versión diferente de mpv (p.ej. Git HEAD).",
+    "mpv-failed-advice": "The reason mpv cannot start may be due to the use of unsupported command line arguments or an unsupported version of mpv.", # TODO: Translate
     "player-file-open-error": "El reproductor falló al abrir el archivo",
     "player-path-error": "La ruta del reproductor no está definida correctamente. Los reproductores soportados son: mpv, mpv.net, VLC, MPC-HC, MPC-BE y mplayer2",
     "hostname-empty-error": "El nombre del host no puede ser vacío",
@@ -168,11 +169,13 @@ es = {
     "file-argument": 'archivo a reproducir',
     "args-argument": 'opciones del reproductor, si necesitas pasar opciones que empiezan con -, pásalas utilizando \'--\'',
     "clear-gui-data-argument": 'restablece ruta y los datos del estado de la ventana GUI almacenados como QSettings',
-    "language-argument": 'lenguaje para los mensajes de Syncplay (de/en/ru/it/es)',
+    "language-argument": 'lenguaje para los mensajes de Syncplay (de/en/ru/it/es/pt_BR)',
 
     "version-argument": 'imprime tu versión',
     "version-message": "Estás usando la versión de Syncplay {} ({})",
 
+    "load-playlist-from-file-argument": "loads playlist from text file (one entry per line)", # TODO: Translate
+
     # Client labels
     "config-window-title": "Configuración de Syncplay",
 
@@ -297,6 +300,8 @@ es = {
     "openmedia-menu-label": "A&brir archivo multimedia",
     "openstreamurl-menu-label": "Abrir URL de &flujo de medios",
     "setmediadirectories-menu-label": "&Establecer directorios de medios",
+    "loadplaylistfromfile-menu-label": "&Load playlist from file",  # TODO: Translate
+    "saveplaylisttofile-menu-label": "&Save playlist to file",  # TODO: Translate
     "exit-menu-label": "&Salir",
     "advanced-menu-label": "A&vanzado",
     "window-menu-label": "&Ventana",

syncplay/messages_it.py

@@ -107,6 +107,7 @@ it = {
     "mpc-version-insufficient-error": "La tua versione di MPC è troppo vecchia, per favore usa `mpc-hc` >= `{}`",
     "mpc-be-version-insufficient-error": "La tua versione di MPC è troppo vecchia, per favore usa `mpc-be` >= `{}`",
     "mpv-version-error": "Syncplay non è compatibile con questa versione di mpv. Per favore usa un'altra versione di mpv (es. Git HEAD).",
+    "mpv-failed-advice": "The reason mpv cannot start may be due to the use of unsupported command line arguments or an unsupported version of mpv.", # TODO: Translate
     "player-file-open-error": "Il player non è riuscito ad aprire il file",
     "player-path-error": "Il path del player non è configurato correttamente. I player supportati sono: mpv, mpv.net, VLC, MPC-HC, MPC-BE e mplayer2",
     "hostname-empty-error": "Il campo hostname non può essere vuoto",
@@ -168,11 +169,13 @@ it = {
     "file-argument": 'file da riprodurre',
     "args-argument": 'opzioni del player, se hai bisogno di utilizzare opzioni che iniziano con - anteponi un singolo \'--\'',
     "clear-gui-data-argument": 'ripristina il percorso e i dati impostati tramite interfaccia grafica e salvati come QSettings',
-    "language-argument": 'lingua per i messaggi di Syncplay (de/en/ru/it/es)',
+    "language-argument": 'lingua per i messaggi di Syncplay (de/en/ru/it/es/pt_BR)',
 
     "version-argument": 'mostra la tua versione',
     "version-message": "Stai usando la versione di Syncplay {} ({})",
 
+    "load-playlist-from-file-argument": "loads playlist from text file (one entry per line)", # TODO: Translate
+
     # Client labels
     "config-window-title": "Configurazione di Syncplay",
 
@@ -297,6 +300,8 @@ it = {
     "openmedia-menu-label": "&Apri file multimediali",
     "openstreamurl-menu-label": "Apri indirizzo di &rete",
     "setmediadirectories-menu-label": "Imposta &cartelle multimediali",
+    "loadplaylistfromfile-menu-label": "&Load playlist from file",  # TODO: Translate
+    "saveplaylisttofile-menu-label": "&Save playlist to file",  # TODO: Translate
     "exit-menu-label": "&Esci",
     "advanced-menu-label": "&Avanzate",
     "window-menu-label": "&Finestra",

syncplay/messages_pt_BR.py

@@ -0,0 +1,507 @@
+# coding:utf8
+
+"""Brazilian Portuguese dictionary"""
+
+pt_BR = {
+    "LANGUAGE": "Português do Brasil",
+
+    # Client notifications
+    "config-cleared-notification": "Configurações removidas. Mudanças serão salvas quando você armazenar uma configuração válida.",
+
+    "relative-config-notification": "Arquivo(s) de configuração relativa carregado(s): {}",
+
+    "connection-attempt-notification": "Tentando se conectar a {}:{}",  # Port, IP
+    "reconnection-attempt-notification": "Conexão com o servidor perdida, tentando reconectar",
+    "disconnection-notification": "Desconectado do servidor",
+    "connection-failed-notification": "Conexão com o servidor falhou",
+    "connected-successful-notification": "Conectado com sucesso ao servidor",
+    "retrying-notification": "%s, tentando novamente em %d segundos...",  # Seconds
+    "reachout-successful-notification": "Alcançado {} ({}) com sucesso",
+
+    "rewind-notification": "Retrocedendo devido à diferença de tempo com {}",  # User
+    "fastforward-notification": "Avançando devido à diferença de tempo com {}",  # User
+    "slowdown-notification": "Diminuindo a velocidade devido à diferença de tempo com {}",  # User
+    "revert-notification": "Revertendo velocidade ao normal",
+
+    "pause-notification": "{} pausou",  # User
+    "unpause-notification": "{} despausou",  # User
+    "seek-notification": "{} saltou de {} para {}",  # User, from time, to time
+
+    "current-offset-notification": "Deslocamento atual: {} segundos",  # Offset
+
+    "media-directory-list-updated-notification": "Os diretórios de mídia do Syncplay foram atualizados.",
+
+    "room-join-notification": "{} entrou na sala: '{}'",  # User
+    "left-notification": "{} saiu da sala",  # User
+    "left-paused-notification": "{} saiu da sala, {} pausou",  # User who left, User who paused
+    "playing-notification": "{} está tocando '{}' ({})",  # User, file, duration
+    "playing-notification/room-addendum":  " na sala: '{}'",  # Room
+
+    "not-all-ready": "Não está pronto: {}",  # Usernames
+    "all-users-ready": "Todo mundo está pronto ({} users)",  # Number of ready users
+    "ready-to-unpause-notification": "Agora você está definido como pronto - despause novamente para despausar",
+    "set-as-ready-notification": "Agora você está definido como pronto",
+    "set-as-not-ready-notification": "Agora você está definido como não pronto",
+    "autoplaying-notification": "Reprodução automática em {}...",  # Number of seconds until playback will start
+
+    "identifying-as-controller-notification": "Identificando-se como operador da sala com a senha '{}'...",
+    "failed-to-identify-as-controller-notification": "{} falhou ao se identificar como operador da sala.",
+    "authenticated-as-controller-notification": "{} autenticou-se como um operador da sala",
+    "created-controlled-room-notification": "Criou a sala gerenciada '{}' com a senha '{}'. Por favor, salve essa informação para futura referência!",  # RoomName, operatorPassword
+
+    "file-different-notification": "O arquivo que você está tocando parece ser diferente do arquivo de {}",  # User
+    "file-differences-notification": "Seus arquivos se diferem da(s) seguinte(s) forma(s): {}",  # Differences
+    "room-file-differences": "Diferenças de arquivos: {}",  # File differences (filename, size, and/or duration)
+    "file-difference-filename": "nome",
+    "file-difference-filesize": "tamanho",
+    "file-difference-duration": "duração",
+    "alone-in-the-room": "Você está sozinho na sala",
+
+    "different-filesize-notification": " (o tamanho do arquivo deles é diferente do seu!)",
+    "userlist-playing-notification": "{} está tocando:",  # Username
+    "file-played-by-notification": "Arquivo: {} está sendo tocado por:",  # File
+    "no-file-played-notification": "{} não está tocando um arquivo",  # Username
+    "notplaying-notification": "Pessoas que não estão tocando nenhum arquivo:",
+    "userlist-room-notification":  "Na sala '{}':",  # Room
+    "userlist-file-notification": "Arquivo",
+    "controller-userlist-userflag": "Operador",
+    "ready-userlist-userflag": "Pronto",
+
+    "update-check-failed-notification": "Não foi possível verificar automaticamente se o Syncplay {} é a versão mais recente. Deseja visitar https://syncplay.pl/  para checar manualmente por atualizações?",  # Syncplay version
+    "syncplay-uptodate-notification": "O Syncplay está atualizado",
+    "syncplay-updateavailable-notification": "Uma nova versão do Syncplay está disponível. Deseja visitar a página de lançamentos?",
+
+    "mplayer-file-required-notification": "Syncplay com mplayer requer que você forneça o arquivo ao começar",
+    "mplayer-file-required-notification/example": "Exemplo de uso: syncplay [opções] [url|caminho_ate_o_arquivo/]nome_do_arquivo",
+    "mplayer2-required": "O Syncplay é incompatível com o MPlayer 1.x, por favor use mplayer2 ou mpv",
+
+    "unrecognized-command-notification": "Comando não reconhecido",
+    "commandlist-notification": "Comandos disponíveis:",
+    "commandlist-notification/room": "\tr [nome] - muda de sala",
+    "commandlist-notification/list": "\tl - mostra lista de usuários",
+    "commandlist-notification/undo": "\tu - desfaz último salto",
+    "commandlist-notification/pause": "\tp - alterna pausa",
+    "commandlist-notification/seek": "\t[s][+-]time - salta para o valor de tempo dado, se + ou - não forem especificados, será o tempo absoluto em segundos ou minutos:segundos",
+    "commandlist-notification/help": "\th - esta mensagem de ajuda",
+    "commandlist-notification/toggle": "\tt - alterna o seu status de prontidão para assistir",
+    "commandlist-notification/create": "\tc [nome] - cria sala gerenciado usando o nome da sala atual",
+    "commandlist-notification/auth": "\ta [senha] - autentica-se como operador da sala com a senha",
+    "commandlist-notification/chat": "\tch [mensagem] - envia uma mensagem no chat da sala",
+    "syncplay-version-notification": "Versão do Syncplay: {}",  # syncplay.version
+    "more-info-notification": "Mais informações disponíveis em: {}",  # projectURL
+
+    "gui-data-cleared-notification": "O Syncplay limpou o caminho e o estado de dados da janela usados pela GUI.",
+    "language-changed-msgbox-label": "O idioma será alterado quando você salvar as mudanças e abrir o Syncplay novamente.",
+    "promptforupdate-label": "O Syncplay pode verificar automaticamente por atualizações de tempos em tempos?",
+
+    "media-player-latency-warning": "Aviso: O reprodutor de mídia demorou {} para responder. Se você tiver problemas de sincronização, feche outros programas para liberar recursos do sistema e, se isso não funcionar, tente outro reprodutor de mídia.",  # Seconds to respond
+    "mpv-unresponsive-error": "O mpv não respondeu por {} segundos, portanto parece que não está funcionando. Por favor, reinicie o Syncplay.",  # Seconds to respond
+
+    # Client prompts
+    "enter-to-exit-prompt": "Aperte Enter para sair\n",
+
+    # Client errors
+    "missing-arguments-error": "Alguns argumentos necessários estão faltando, por favor reveja --help",
+    "server-timeout-error": "A conexão com o servidor ultrapassou o tempo limite",
+    "mpc-slave-error": "Não foi possível abrir o MPC no slave mode!",
+    "mpc-version-insufficient-error": "A versão do MPC é muito antiga, por favor use `mpc-hc` >= `{}`",
+    "mpc-be-version-insufficient-error": "A versão do MPC-BE é muito antiga, por favor use `mpc-be` >= `{}`",
+    "mpv-version-error": "O Syncplay não é compatível com esta versão do mpv. Por favor, use uma versão diferente do mpv (por exemplo, Git HEAD).",
+    "mpv-failed-advice": "The reason mpv cannot start may be due to the use of unsupported command line arguments or an unsupported version of mpv.", # TODO: Translate
+    "player-file-open-error": "O reprodutor falhou ao abrir o arquivo",
+    "player-path-error": "O caminho até o arquivo executável do reprodutor não está configurado corretamente. Os reprodutores suportados são: mpv, mpv.net, VLC, MPC-HC, MPC-BE e mplayer2",
+    "hostname-empty-error": "O endereço do servidor não pode ser vazio",
+    "empty-error": "{} não pode ser vazio",  # Configuration
+    "media-player-error": "Erro do reprodutor de mídia: \"{}\"",  # Error line
+    "unable-import-gui-error": "Não foi possível importar bibliotecas da GUI. Se você não possuir o PySide instalado, instale-o para que a GUI funcione.",
+    "unable-import-twisted-error": "Não foi possível importar o Twisted. Por favor, instale o Twisted v16.4.0 ou superior.",
+
+    "arguments-missing-error": "Alguns argumentos necessários estão faltando, por favor reveja --help",
+
+    "unable-to-start-client-error": "Não foi possível iniciar o client",
+
+    "player-path-config-error": "O caminho até o arquivo executável do reprodutor não está configurado corretamente. Os reprodutores suportados são: mpv, mpv.net, VLC, MPC-HC, MPC-BE e mplayer2.",
+    "no-file-path-config-error": "O arquivo deve ser selecionado antes de iniciar seu reprodutor",
+    "no-hostname-config-error": "O endereço do servidor não pode ser vazio",
+    "invalid-port-config-error": "A porta deve ser válida",
+    "empty-value-config-error": "{} não pode ser vazio",  # Config option
+
+    "not-json-error": "Não é uma string codificada como json\n",
+    "hello-arguments-error": "Not enough Hello arguments\n",  # DO NOT TRANSLATE
+    "version-mismatch-error": "Discrepância entre versões do client e do servidor\n",
+    "vlc-failed-connection": "Falha ao conectar ao VLC. Se você não instalou o syncplay.lua e está usando a versão mais recente do VLC, por favor veja https://syncplay.pl/LUA/ para mais instruções.",
+    "vlc-failed-noscript": "O VLC reportou que a interface de script do syncplay.lua não foi instalada. Por favor, veja https://syncplay.pl/LUA/ para mais instruções.",
+    "vlc-failed-versioncheck": "Esta versão do VLC não é suportada pelo Syncplay.",
+
+    "feature-sharedPlaylists": "playlists compartilhadas",  # used for not-supported-by-server-error
+    "feature-chat": "chat",  # used for not-supported-by-server-error
+    "feature-readiness": "prontidão",  # used for not-supported-by-server-error
+    "feature-managedRooms": "salas gerenciadas",  # used for not-supported-by-server-error
+
+    "not-supported-by-server-error": "O recurso {} não é suportado por este servidor.",  # feature
+    "shared-playlists-not-supported-by-server-error": "O recurso de playlists compartilhadas pode não ser suportado por este servidor. Para garantir que funcione corretamente, é necessário um servidor rodando Syncplay {} ou superior, mas este está rodando Syncplay {}.",  # minVersion, serverVersion
+    "shared-playlists-disabled-by-server-error": "O recurso de playlists compartilhadas foi desativado nas configurações do servidor. Para usar este recurso, você precisa se conectar a um servidor diferente.",
+
+    "invalid-seek-value": "Valor de salto inválido",
+    "invalid-offset-value": "Valor de deslocamento inválido",
+
+    "switch-file-not-found-error": "Não foi possível mudar para o arquivo '{0}'. O Syncplay procura nos diretórios de mídia especificados.",  # File not found
+    "folder-search-timeout-error": "A busca por mídias no diretório de mídias foi cancelada pois demorou muito tempo para procurar em '{}'. Isso ocorre quando você seleciona uma pasta com muitas subpastas em sua lista de pastas de mídias a serem pesquisadas.  Para que a troca automática de arquivos funcione novamente, selecione 'Arquivo -> Definir diretórios de mídias' na barra de menus e remova esse diretório ou substitua-o por uma subpasta apropriada. Se a pasta não tiver problemas, é possível reativá-la selecionando 'Arquivo -> Definir diretórios de mídias' e pressionando 'OK'.",  # Folder
+    "folder-search-first-file-timeout-error": "A busca por mídias em '{}' foi interrompida, pois demorou muito para acessar o diretório. Isso pode acontecer se for uma unidade de rede ou se você configurar sua unidade para hibernar depois de um período de inatividade. Para que a troca automática de arquivos funcione novamente, vá para 'Arquivo -> Definir diretórios de mídias' e remova o diretório ou resolva o problema (por exemplo, alterando as configurações de economia de energia da unidade).",  # Folder
+    "added-file-not-in-media-directory-error": "Você carregou um arquivo em '{}', que não é um diretório de mídias conhecido. Você pode adicioná-lo isso como um diretório de mídia selecionando 'Arquivo -> Definir diretórios de mídias' na barra de menus.",  # Folder
+    "no-media-directories-error": "Nenhum diretório de mídias foi definido. Para que os recursos de playlists compartilhadas e troca automática de arquivos funcionem corretamente, selecione 'Arquivo -> Definir diretórios de mídias' e especifique onde o Syncplay deve procurar para encontrar arquivos de mídia.",
+    "cannot-find-directory-error": "Não foi possível encontrar o diretório de mídia '{}'. Para atualizar sua lista de diretórios de mídias, selecione 'Arquivo -> Definir diretórios de mídias' na barra de menus e especifique onde o Syncplay deve procurar para encontrar arquivos de mídia.",
+
+    "failed-to-load-server-list-error": "Não foi possível carregar a lista de servidores públicos. Por favor, visite https://www.syncplay.pl/ em seu navegador.",
+
+    # Client arguments
+    "argument-description": 'Solução para sincronizar reprodução de múltiplas instâncias de reprodutores de mídia pela rede.',
+    "argument-epilog": 'Se nenhuma opção for fornecida, os valores de _config serão usados',
+    "nogui-argument": 'não mostrar GUI',
+    "host-argument": 'endereço do servidor',
+    "name-argument": 'nome de usuário desejado',
+    "debug-argument": 'modo depuração',
+    "force-gui-prompt-argument": 'fazer o prompt de configuração aparecer',
+    "no-store-argument": 'não guardar valores em .syncplay',
+    "room-argument": 'sala padrão',
+    "password-argument": 'senha do servidor',
+    "player-path-argument": 'caminho até o executável do reprodutor de mídia',
+    "file-argument": 'arquivo a ser tocado',
+    "args-argument": 'opções do reprodutor; se você precisar passar opções começando com -, as preceda com um único argumento \'--\'',
+    "clear-gui-data-argument": 'redefine o caminho e o estado de dados da janela da GUI para as de QSettings',
+    "language-argument": 'idioma para mensagens do Syncplay (de/en/ru/it/es/pt_BR)',
+
+    "version-argument": 'exibe sua versão',
+    "version-message": "Você está usando o Syncplay versão {} ({})",
+
+    "load-playlist-from-file-argument": "carrega playlist de um arquivo de texto (uma entrada por linha)",
+
+    # Client labels
+    "config-window-title": "Configuração do Syncplay",
+
+    "connection-group-title": "Configurações de conexão",
+    "host-label": "Endereço do servidor: ",
+    "name-label": "Nome de usuário (opcional): ",
+    "password-label": "Senha do servidor (se existir): ",
+    "room-label": "Sala padrão: ",
+
+    "media-setting-title": "Configurações do reprodutor de mídia",
+    "executable-path-label": "Executável do reprodutor:",
+    "media-path-label": "Arquivo de vídeo ou URL (opcional):",
+    "player-arguments-label": "Argumentos para o reprodutor (opcional):",
+    "browse-label": "Navegar",
+    "update-server-list-label": "Atualizar lista",
+
+    "more-title": "Mostrar mais configurações",
+    "never-rewind-value": "Nunca",
+    "seconds-suffix": " s",
+    "privacy-sendraw-option": "Enviar bruto",
+    "privacy-sendhashed-option": "Enviar hasheado",
+    "privacy-dontsend-option": "Não enviar",
+    "filename-privacy-label": "Informação do nome do arquivo:",
+    "filesize-privacy-label": "Informação do tamanho do arquivo:",
+    "checkforupdatesautomatically-label": "Verificar atualizações do Syncplay automaticamente",
+    "slowondesync-label": "Diminuir velocidade em dessincronizações menores (não suportado pelo MPC-HC/BE)",
+    "rewindondesync-label": "Retroceder em dessincronização maiores (recomendado)",
+    "fastforwardondesync-label": "Avançar se estiver ficando para trás (recomendado)",
+    "dontslowdownwithme-label": "Nunca desacelerar ou retroceder outros (experimental)",
+    "pausing-title": "Pausando",
+    "pauseonleave-label": "Pausar quando um usuário sair (por exemplo, se for desconectado)",
+    "readiness-title": "Estado de prontidão inicial",
+    "readyatstart-label": "Marque-me como 'pronto para assistir' por padrão",
+    "forceguiprompt-label": "Não mostrar sempre a janela de configuração do Syncplay",  # (Inverted)
+    "showosd-label": "Ativar mensagens na tela (OSD)",
+
+    "showosdwarnings-label": "Incluir avisos (por exemplo, quando arquivos são diferentes, usuários não estão prontos, etc)",
+    "showsameroomosd-label": "Incluir eventos da sua sala",
+    "shownoncontrollerosd-label": "Incluir eventos de não operadores em salas gerenciadas",
+    "showdifferentroomosd-label": "Incluir eventos de outras salas",
+    "showslowdownosd-label": "Incluir notificações de desaceleramento ou retrocedimento",
+    "language-label": "Idioma:",
+    "automatic-language": "Padrão ({})",  # Default language
+    "showdurationnotification-label": "Avisar sobre discrepância nas durações dos arquivos de mídia",
+    "basics-label": "Básicos",
+    "readiness-label": "Play/Pause",
+    "misc-label": "Miscelânea",
+    "core-behaviour-title": "Comportamento da sala padrão",
+    "syncplay-internals-title": "Syncplay internals",
+    "syncplay-mediasearchdirectories-title": "Diretórios a buscar por mídias",
+    "syncplay-mediasearchdirectories-label": "Diretórios a buscar por mídias (um caminho por linha)",
+    "sync-label": "Sincronizar",
+    "sync-otherslagging-title": "Se outros estiverem ficando pra trás...",
+    "sync-youlaggging-title": "Se você estiver ficando pra trás...",
+    "messages-label": "Mensagens",
+    "messages-osd-title": "Configurações das mensagens na tela (OSD)",
+    "messages-other-title": "Outras configurações de tela",
+    "chat-label": "Chat",
+    "privacy-label": "Privacidade",  # Currently unused, but will be brought back if more space is needed in Misc tab
+    "privacy-title": "Configurações de privacidade",
+    "unpause-title": "Se você apertar play, definir-se como pronto e:",
+    "unpause-ifalreadyready-option": "Despausar se você já estiver definido como pronto",
+    "unpause-ifothersready-option": "Despausar se você já estiver pronto ou outros na sala estiverem prontos (padrão)",
+    "unpause-ifminusersready-option": "Despausar se você já estiver pronto ou outros na sala estiverem prontos e o número mínimo de usuários está pronto",
+    "unpause-always": "Sempre despausar",
+    "syncplay-trusteddomains-title": "Domínios confiáveis (para serviços de streaming e conteúdo hospedado)",
+
+    "chat-title": "Entrada de mensagem do chat",
+    "chatinputenabled-label": "Habilitar entrada de chat via mpv",
+    "chatdirectinput-label": "Permitir entrada instantânea de chat (evita ter de apertar Enter para abrir o chat)",
+    "chatinputfont-label": "Fonte da entrada de chat",
+    "chatfont-label": "Definir fonte",
+    "chatcolour-label": "Definir cor",
+    "chatinputposition-label": "Posição da área de entrada de mensagens no mpv",
+    "chat-top-option": "Topo",
+    "chat-middle-option": "Meio",
+    "chat-bottom-option": "Fundo",
+    "chatoutputheader-label": "Saída de mensagem do chat",
+    "chatoutputfont-label": "Fonte da saída de chat",
+    "chatoutputenabled-label": "Habilitar saída de chat no reprodutor de mídia (apenas mpv por enquanto)",
+    "chatoutputposition-label": "Modo de saída",
+    "chat-chatroom-option": "Estilo sala de bate-papo",
+    "chat-scrolling-option": "Estilo de rolagem",
+
+    "mpv-key-tab-hint": "[TAB] para alternar acesso instantâneo ao chat.",
+    "mpv-key-hint": "[ENTER] para enviar mensagem. [ESC] para sair do modo de chat.",
+    "alphakey-mode-warning-first-line": "Você pode usar os antigos atalhos do mpv com as teclas a-z.",
+    "alphakey-mode-warning-second-line": "Aperte [TAB] para retornar ao modo de chat instantâneo do Syncplay.",
+
+    "help-label": "Ajuda",
+    "reset-label": "Restaurar padrões",
+    "run-label": "Começar Syncplay",
+    "storeandrun-label": "Salvar mudanças e começar Syncplay",
+
+    "contact-label": "Sinta-se livre para mandar um e-mail para <a href=\"mailto:dev@syncplay.pl\"><nobr>dev@syncplay.pl</nobr></a>, conversar via chat pelo <a href=\"https://webchat.freenode.net/?channels=#syncplay\"><nobr>canal do IRC #Syncplay</nobr></a> no irc.freenode.net, <a href=\"https://github.com/Uriziel/syncplay/issues\"><nobr>abrir uma issue</nobr></a> pelo GitHub, <a href=\"https://www.facebook.com/SyncplaySoftware\"><nobr>curtir nossa página no Facebook</nobr></a>, <a href=\"https://twitter.com/Syncplay/\"><nobr>nos seguir no Twitter</nobr></a> ou visitar <a href=\"https://syncplay.pl/\"><nobr>https://syncplay.pl/</nobr></a>. Não use o Syncplay para mandar informações sensíveis/confidenciais.",
+
+    "joinroom-label": "Juntar-se a uma sala",
+    "joinroom-menu-label": "Juntar-se à sala {}",
+    "seektime-menu-label": "Saltar para o tempo",
+    "undoseek-menu-label": "Desfazer salto",
+    "play-menu-label": "Play",
+    "pause-menu-label": "Pause",
+    "playbackbuttons-menu-label": "Mostrar botões de reprodução",
+    "autoplay-menu-label": "Mostrar botão de reprodução automática",
+    "autoplay-guipushbuttonlabel": "Tocar quando todos estiverem prontos",
+    "autoplay-minimum-label": "Mín. de usuários:",
+
+    "sendmessage-label": "Enviar",
+
+    "ready-guipushbuttonlabel": "Estou pronto para assistir!",
+
+    "roomuser-heading-label": "Sala / Usuário",
+    "size-heading-label": "Tamanho",
+    "duration-heading-label": "Duração",
+    "filename-heading-label": "Nome do arquivo",
+    "notifications-heading-label": "Notificações",
+    "userlist-heading-label": "Lista de quem está tocando o quê",
+
+    "browseformedia-label": "Navegar por arquivos de mídia",
+
+    "file-menu-label": "&Arquivo",  # & precedes shortcut key
+    "openmedia-menu-label": "A&brir arquivo de mídia",
+    "openstreamurl-menu-label": "Abrir &URL de stream de mídia",
+    "setmediadirectories-menu-label": "Definir &diretórios de mídias",
+    "loadplaylistfromfile-menu-label": "&Carregar playlist de arquivo",
+    "saveplaylisttofile-menu-label": "&Salvar playlist em arquivo",
+    "exit-menu-label": "&Sair",
+    "advanced-menu-label": "A&vançado",
+    "window-menu-label": "&Janela",
+    "setoffset-menu-label": "Definir &deslocamento",
+    "createcontrolledroom-menu-label": "&Criar sala gerenciada",
+    "identifyascontroller-menu-label": "&Identificar-se como operador da sala",
+    "settrusteddomains-menu-label": "D&efinir domínios confiáveis",
+    "addtrusteddomain-menu-label": "Adicionar {} como domínio confiável",  # Domain
+
+    "edit-menu-label": "&Editar",
+    "cut-menu-label": "Cor&tar",
+    "copy-menu-label": "&Copiar",
+    "paste-menu-label": "C&olar",
+    "selectall-menu-label": "&Selecionar todos",
+
+    "playback-menu-label": "&Reprodução",
+
+    "help-menu-label": "&Ajuda",
+    "userguide-menu-label": "Abrir &guia de usuário",
+    "update-menu-label": "&Verificar atualizações",
+
+    "startTLS-initiated": "Tentando estabelecer conexão segura",
+    "startTLS-secure-connection-ok": "Conexão segura estabelecida ({})",
+    "startTLS-server-certificate-invalid": 'Não foi possível estabelecer uma conexão segura. O servidor usa um certificado de segurança inválido. Essa comunicação pode ser interceptada por terceiros. Para mais detalhes de solução de problemas, consulte <a href="https://syncplay.pl/trouble">aqui</a>.',
+    "startTLS-not-supported-client": "Este client não possui suporte para TLS",
+    "startTLS-not-supported-server": "Este servidor não possui suporte para TLS",
+
+    # TLS certificate dialog
+    "tls-information-title": "Detalhes do certificado",
+    "tls-dialog-status-label": "<strong>Syncplay está usando uma conexão criptografada para {}.</strong>",
+    "tls-dialog-desc-label": "A criptografia com um certificado digital mantém as informações em sigilo quando são enviadas para ou do<br/>servidor {}.",
+    "tls-dialog-connection-label": "Informações criptografadas usando o Transport Layer Security (TLS), versão {} com o conjunto de cifras (cipher suite)<br/>: {}.",
+    "tls-dialog-certificate-label": "Certificado emitido em {} e válido até {}.",
+
+    # About dialog
+    "about-menu-label": "&Sobre o Syncplay",
+    "about-dialog-title": "Sobre o Syncplay",
+    "about-dialog-release": "Versão {}, lançamento {}",
+    "about-dialog-license-text": "Licenciado sob a Licença&nbsp;Apache,&nbsp;Versão 2.0",
+    "about-dialog-license-button": "Licença",
+    "about-dialog-dependencies": "Dependências",
+
+    "setoffset-msgbox-label": "Definir deslocamento",
+    "offsetinfo-msgbox-label": "Deslocamento (veja https://syncplay.pl/guide/ para instruções de uso):",
+
+    "promptforstreamurl-msgbox-label": "Abrir transmissão de mídia via URL",
+    "promptforstreamurlinfo-msgbox-label": "Transmitir URL",
+
+    "addfolder-label": "Adicionar pasta",
+
+    "adduris-msgbox-label": "Adicionar URLs à playlist (uma por linha)",
+    "editplaylist-msgbox-label": "Definir playlist (uma por linha)",
+    "trusteddomains-msgbox-label": "Domínios para os quais é permitido trocar automaticamente (um por linha)",
+
+    "createcontrolledroom-msgbox-label": "Criar sala gerenciada",
+    "controlledroominfo-msgbox-label": "Informe o nome da sala gerenciada\r\n(veja https://syncplay.pl/guide/ para instruções de uso):",
+
+    "identifyascontroller-msgbox-label": "Identificar-se como operador da sala",
+    "identifyinfo-msgbox-label": "Informe a senha de operador para esta sala\r\n(veja https://syncplay.pl/guide/ para instruções de uso):",
+
+    "public-server-msgbox-label": "Selecione o servidor público para esta sessão de visualização",
+
+    "megabyte-suffix": " MB",
+
+    # Tooltips
+
+    "host-tooltip": "Hostname ou IP para se conectar, opcionalmente incluindo uma porta (por exemplo, syncplay.pl:8999). Só sincroniza-se com pessoas no mesmo servidor/porta.",
+    "name-tooltip": "Nome pelo qual você será conhecido. Não há cadastro, então você pode facilmente mudar mais tarde. Se não for especificado, será gerado aleatoriamente.",
+    "password-tooltip": "Senhas são necessárias apenas para servidores privados.",
+    "room-tooltip": "O nome da sala para se conectar pode ser praticamente qualquer coisa, mas você só irá se sincronizar com pessoas na mesma sala.",
+
+    "executable-path-tooltip": "Localização do seu reprodutor de mídia preferido (mpv, VLC, MPC-HC/BE ou mplayer2).",
+    "media-path-tooltip": "Localização do vídeo ou transmissão a ser aberto. Necessário com o mplayer2.",
+    "player-arguments-tooltip": "Argumentos de comando de linha adicionais para serem repassados ao reprodutor de mídia.",
+    "mediasearcdirectories-arguments-tooltip": "Diretório onde o Syncplay vai procurar por arquivos de mídia, por exemplo quando você estiver usando o recurso de clicar para mudar. O Syncplay irá procurar recursivamente pelas subpastas.",
+
+    "more-tooltip": "Exibe configurações menos frequentemente utilizadas.",
+    "filename-privacy-tooltip": "Modo de privacidade para mandar nome de arquivo do arquivo atual para o servidor.",
+    "filesize-privacy-tooltip": "Modo de privacidade para mandar tamanho do arquivo atual para o servidor.",
+    "privacy-sendraw-tooltip": "Enviar esta informação sem ofuscação. Esta é a opção padrão com mais funcionalidades.",
+    "privacy-sendhashed-tooltip": "Mandar versão hasheada da informação, tornando-a menos visível aos outros clients.",
+    "privacy-dontsend-tooltip": "Não enviar esta informação ao servidor. Esta opção oferece a maior privacidade.",
+    "checkforupdatesautomatically-tooltip": "Checar o site do Syncplay regularmente para ver se alguma nova versão do Syncplay está disponível.",
+    "slowondesync-tooltip": "Reduzir a velocidade de reprodução temporariamente quando necessário para trazer você de volta à sincronia com os outros espectadores. Não suportado pelo MPC-HC/BE.",
+    "dontslowdownwithme-tooltip": "Significa que outros não serão desacelerados ou retrocedidos se sua reprodução estiver ficando para trás. Útil para operadores de salas.",
+    "pauseonleave-tooltip": "Pausar reprodução se você for disconectado ou se alguém sair da sua sala.",
+    "readyatstart-tooltip": "Definir-se como 'pronto' ao começar (do contrário você será definido como 'não pronto' até mudar seu estado de prontidão)",
+    "forceguiprompt-tooltip": "Diálogo de configuração não é exibido ao abrir um arquivo com o Syncplay.",  # (Inverted)
+    "nostore-tooltip": "Começar Syncplay com a dada configuração, mas não guardar as mudanças permanentemente.",  # (Inverted)
+    "rewindondesync-tooltip": "Retroceder automaticamente quando necessário para sincronizar. Desabilitar isto pode resultar em grandes dessincronizações!",
+    "fastforwardondesync-tooltip": "Avançar automaticamente quando estiver fora de sincronia com o operador da sala (ou sua posição pretendida caso 'Nunca desacelerar ou retroceder outros' estiver habilitada).",
+    "showosd-tooltip": "Envia mensagens do Syncplay à tela do reprodutor de mídia (OSD).",
+    "showosdwarnings-tooltip": "Mostra avisos se: estiver tocando arquivos diferentes, sozinho na sala, usuários não prontos, etc.",
+    "showsameroomosd-tooltip": "Mostra notificações na tela (OSD) sobre eventos relacionados à sala em que o usuário está.",
+    "shownoncontrollerosd-tooltip": "Mostra notificações na tela (OSD) sobre eventos relacionados a não operadores que estão em salas gerenciadas.",
+    "showdifferentroomosd-tooltip": "Mostra notificações na tela (OSD) sobre eventos relacionados à sala em que o usuário não está.",
+    "showslowdownosd-tooltip": "Mostra notificações na tela (OSD) sobre desaceleramento/retrocedimento por conta de diferença nos tempos.",
+    "showdurationnotification-tooltip": "Útil quando um segmento em um arquivo de múltiplas partes está faltando, mas pode resultar em falsos positivos.",
+    "language-tooltip": "Idioma a ser utilizado pelo Syncplay.",
+    "unpause-always-tooltip": "Se você pressionar para despausar, sempre te definirá como pronto e despausará em vez de simplesmente te definir com pronto.",
+    "unpause-ifalreadyready-tooltip": "Se você pressionar para despausar quando não estiver pronto, irá te definir como pronto - despause novamente para despausar.",
+    "unpause-ifothersready-tooltip": "Se você apertar para despausar quando não estiver pronto, só irá despausar quando outros estiverem prontos.",
+    "unpause-ifminusersready-tooltip": "Se você apertar para despausar quando não estiver pronto, só irá despausar quando outros estiverem prontos e o número mínimo de usuários for atingido.",
+    "trusteddomains-arguments-tooltip": "Domínios para os quais é permitido trocar automaticamente quando as playlists compartilhadas estiverem habilitadas.",
+
+    "chatinputenabled-tooltip": "Ativar entrada de chat via mpv (pressione Enter para escrever, Enter para enviar, ESC para cancelar)",
+    "chatdirectinput-tooltip": "Evita ter de apertar 'Enter' para entrar no modo de entrada de chat no mpv. Pressione TAB no mpv para temporariamente desabilitar esta função.",
+    "font-label-tooltip": "Fonte usada ao escrever mensagens no chat no mpv. Apenas no lado do client, portanto não afeta a cor que os outros veem.",
+    "set-input-font-tooltip": "Família de fonte usada ao escrever mensagens no chat no mpv. Apenas no lado do client, portanto não afeta a cor que os outros veem.",
+    "set-input-colour-tooltip": "Cor de fonte usada ao escrever mensagens no chat no mpv. Apenas no lado do client, portanto não afeta a cor que os outros veem.",
+    "chatinputposition-tooltip": "Lugar no mpv onde a entrada de chat será exibida quando você apertar Enter e digitar.",
+    "chatinputposition-top-tooltip": "Colocar entrada de chat no topo da janela do mpv.",
+    "chatinputposition-middle-tooltip": "Colocar entrada de chat no meio da janela do mpv.",
+    "chatinputposition-bottom-tooltip": "Colocar entrada de chat no fundo da janela do mpv.",
+    "chatoutputenabled-tooltip": "Mostrar mensagens de chat na tela do reprodutor (OSD) (se suportado pelo reprodutor).",
+    "font-output-label-tooltip": "Fonte da saída de chat.",
+    "set-output-font-tooltip": "Fonte usada para exibir mensagens do chat.",
+    "chatoutputmode-tooltip": "Como as mensagens do chat são exibidas.",
+    "chatoutputmode-chatroom-tooltip": "Exibe novas linhas de chat diretamente abaixo da linha anterior.",
+    "chatoutputmode-scrolling-tooltip": "Exibe novas linhas de chat rolando-as da direita pra esquerda.",
+
+    "help-tooltip": "Abre o  guia de usuário do Syncplay.pl.",
+    "reset-tooltip": "Redefine todas as configurações para seus respectivos padrões.",
+    "update-server-list-tooltip": "Conecta ao syncplay.pl para atualizar a lista de servidores públicos.",
+
+    "sslconnection-tooltip": "Conectado com segurança ao servidor. Clique para exibir detalhes do certificado.",
+
+    "joinroom-tooltip": "Sair da sala atual e ingressar na sala especificada.",
+    "seektime-msgbox-label": "Saltar para tempo especificado (em segundos ou minutos:segundos). Use + ou - para fazer um pulo relativo ao tempo atual.",
+    "ready-tooltip": "Indica se você está pronto para assistir.",
+    "autoplay-tooltip": "Reproduzir automaticamente quando todos os usuários que tiverem indicadores de prontidão estiverem prontos e o limiar de usuários for atingido.",
+    "switch-to-file-tooltip": "Clique duas vezes para mudar para {}",  # Filename
+    "sendmessage-tooltip": "Mandar mensagem para a sala",
+
+    # In-userlist notes (GUI)
+    "differentsize-note": "Tamanhos diferentes!",
+    "differentsizeandduration-note": "Tamanhos e durações diferentes!",
+    "differentduration-note": "Durações diferentes!",
+    "nofile-note": "(Nenhum arquivo está sendo tocado)",
+
+    # Server messages to client
+    "new-syncplay-available-motd-message": "Você está usando o Syncplay {}, mas uma versão mais nova está disponível em https://syncplay.pl",  # ClientVersion
+
+    # Server notifications
+    "welcome-server-notification": "Seja bem-vindo ao servidor de Syncplay, versão {0}",  # version
+    "client-connected-room-server-notification": "{0}({2}) conectou-se à sala '{1}'",  # username, host, room
+    "client-left-server-notification": "{0} saiu do servidor",  # name
+    "no-salt-notification": "POR FAVOR, NOTE: Para permitir que as senhas de operadores de sala geradas por esta instância do servidor ainda funcionem quando o servidor for reiniciado, por favor, adicione o seguinte argumento de linha de comando ao executar o servidor de Syncplay no futuro: --salt {}",  # Salt
+
+
+    # Server arguments
+    "server-argument-description": 'Solução para sincronizar a reprodução de múltiplas instâncias de MPlayer e MPC-HC/BE pela rede. Instância de servidor',
+    "server-argument-epilog": 'Se nenhuma opção for fornecida, os valores de _config serão utilizados',
+    "server-port-argument": 'porta TCP do servidor',
+    "server-password-argument": 'senha do servidor',
+    "server-isolate-room-argument": 'salas devem ser isoladas?',
+    "server-salt-argument": "string aleatória utilizada para gerar senhas de salas gerenciadas",
+    "server-disable-ready-argument": "desativar recurso de prontidão",
+    "server-motd-argument": "caminho para o arquivo o qual o motd será obtido",
+    "server-chat-argument": "O chat deve ser desativado?",
+    "server-chat-maxchars-argument": "Número máximo de caracteres numa mensagem do chat (o padrão é {})", # Default number of characters
+    "server-maxusernamelength-argument": "Número máximos de caracteres num nome de usuário (o padrão é {})",
+    "server-stats-db-file-argument": "Habilita estatísticas de servidor usando o arquivo db SQLite fornecido",
+    "server-startTLS-argument": "Habilita conexões TLS usando os arquivos de certificado no caminho fornecido",
+    "server-messed-up-motd-unescaped-placeholders": "A Mensagem do Dia possui placeholders não escapados. Todos os sinais de $ devem ser dobrados (como em $$).",
+    "server-messed-up-motd-too-long": "A Mensagem do Dia é muito longa - máximo de {} caracteres, {} foram dados.",
+
+    # Server errors
+    "unknown-command-server-error": "Comando desconhecido: {}",  # message
+    "not-json-server-error": "Não é uma string codificada como json: {}",  # message
+    "line-decode-server-error": "Não é uma string UTF-8",
+    "not-known-server-error": "Você deve ser conhecido pelo servidor antes de mandar este comando",
+    "client-drop-server-error": "Drop do client: {} -- {}",  # host, error
+    "password-required-server-error": "Senha necessária",
+    "wrong-password-server-error": "Senha incorreta fornecida",
+    "hello-server-error": "Not enough Hello arguments",  # DO NOT TRANSLATE
+
+    # Playlists
+    "playlist-selection-changed-notification":  "{} mudou a seleção da playlist",  # Username
+    "playlist-contents-changed-notification": "{} atualizou playlist",  # Username
+    "cannot-find-file-for-playlist-switch-error": "Não foi possível encontrar o arquivo {} no diretórios de mídia para a troca de playlist!",  # Filename
+    "cannot-add-duplicate-error": "Não foi possível adicionar uma segunda entrada para '{}' para a playlist uma vez que duplicatas não são permitidas.",  # Filename
+    "cannot-add-unsafe-path-error": "Não foi possível automaticamente carregar {} porque este não é um domínio confiado. Você pode trocar para a URL manualmente dando um clique duplo nela na playlist e adicionando o domínio aos domínios confiáveis em 'Arquivo -> Avançado -> Definir domínios confiáveis'. Se você clicar com o botão direito na URL, você pode adicionar esta URL como domínio confiável pelo menu de contexto.",  # Filename
+    "sharedplaylistenabled-label": "Habilitar playlists compartilhadas",
+    "removefromplaylist-menu-label": "Remover da playlist",
+    "shuffleremainingplaylist-menu-label": "Embaralhar resto da playlist",
+    "shuffleentireplaylist-menu-label": "Embaralhar toda a playlist",
+    "undoplaylist-menu-label": "Desfazer última alteração à playlist",
+    "addfilestoplaylist-menu-label": "Adicionar arquivo(s) ao final da playlist",
+    "addurlstoplaylist-menu-label": "Adicionar URL(s) ao final da playlist",
+    "editplaylist-menu-label": "Editar playlist",
+
+    "open-containing-folder": "Abrir pasta contendo este arquivo",
+    "addyourfiletoplaylist-menu-label": "Adicionar seu arquivo à playlist",
+    "addotherusersfiletoplaylist-menu-label": "Adicionar arquivos de {} à playlist",  # [Username]
+    "addyourstreamstoplaylist-menu-label": "Adicionar sua transmissão à playlist",
+    "addotherusersstreamstoplaylist-menu-label": "Adicionar transmissão de {} à playlist",  # [Username]
+    "openusersstream-menu-label": "Abrir transmissão de {}",  # [username]'s
+    "openusersfile-menu-label": "Abrir arquivo de {}",  # [username]'s
+
+    "playlist-instruction-item-message": "Arraste um arquivo aqui para adicioná-lo à playlist compartilhada.",
+    "sharedplaylistenabled-tooltip": "Operadores da sala podem adicionar arquivos para a playlist compartilhada para tornar mais fácil para todo mundo assistir a mesma coisa. Configure os diretórios de mídia em 'Miscelânea'.",
+}

syncplay/messages_ru.py

@@ -107,6 +107,7 @@ ru = {
     "mpc-version-insufficient-error": "Версия MPC слишком старая, пожалуйста, используйте `mpc-hc` >= `{}`",
     "mpc-be-version-insufficient-error": "Версия MPC слишком старая, пожалуйста, используйте `mpc-be` >= `{}`",
     "mpv-version-error": "Syncplay не совместим с данной версией mpv. Пожалуйста, используйте другую версию mpv (лучше свежайшую).",
+    "mpv-failed-advice": "The reason mpv cannot start may be due to the use of unsupported command line arguments or an unsupported version of mpv.", # TODO: Translate
     "player-file-open-error": "Проигрыватель не может открыть файл.",
     "player-path-error": "Путь к проигрывателю задан неверно. Supported players are: mpv, mpv.net, VLC, MPC-HC, MPC-BE and mplayer2.",  # TODO: Translate last sentence
     "hostname-empty-error": "Имя пользователя не может быть пустым.",
@@ -169,11 +170,13 @@ ru = {
     "file-argument": 'воспроизводимый файл',
     "args-argument": 'параметры проигрывателя; если нужно передать параметры, начинающиеся с - , то сначала пишите \'--\'',
     "clear-gui-data-argument": 'сбрасывает путь и данные о состоянии окна GUI, хранимые как QSettings',
-    "language-argument": 'язык сообщений Syncplay (de/en/ru/it/es)',
+    "language-argument": 'язык сообщений Syncplay (de/en/ru/it/es/pt_BR)',
 
     "version-argument": 'выводит номер версии',
     "version-message": "Вы используете Syncplay версии {} ({})",
 
+    "load-playlist-from-file-argument": "loads playlist from text file (one entry per line)", # TODO: Translate
+
     # Client labels
     "config-window-title": "Настройка Syncplay",
 
@@ -299,6 +302,8 @@ ru = {
     "openmedia-menu-label": "&Открыть файл",
     "openstreamurl-menu-label": "Открыть &ссылку",
     "setmediadirectories-menu-label": "&Папки воспроизведения",
+    "loadplaylistfromfile-menu-label": "&Load playlist from file",  # TODO: Translate
+    "saveplaylisttofile-menu-label": "&Save playlist to file",  # TODO: Translate
     "exit-menu-label": "&Выход",
     "advanced-menu-label": "&Дополнительно",
     "window-menu-label": "&Вид",

syncplay/players/mpv.py

@@ -4,17 +4,30 @@ import re
 import sys
 import time
 import subprocess
+import threading
+import ast
 
 from syncplay import constants
-from syncplay.players.mplayer import MplayerPlayer
 from syncplay.messages import getMessage
 from syncplay.utils import isURL, findResourcePath
+from syncplay.utils import isMacOS, isWindows, isASCII
+from syncplay.players.python_mpv_jsonipc.python_mpv_jsonipc import MPV
 
+from syncplay.players.basePlayer import BasePlayer
 
-class MpvPlayer(MplayerPlayer):
+class MpvPlayer(BasePlayer):
     RE_VERSION = re.compile(r'.*mpv (\d+)\.(\d+)\.\d+.*')
     osdMessageSeparator = "\\n"
     osdMessageSeparator = "; "  # TODO: Make conditional
+    POSITION_QUERY = 'time-pos'
+    OSD_QUERY = 'show_text'
+    RE_ANSWER = re.compile(constants.MPLAYER_ANSWER_REGEX)
+    lastResetTime = None
+    lastMPVPositionUpdate = None
+    alertOSDSupported = True
+    chatOSDSupported = True
+    speedSupported = True
+    customOpenDialog = False
 
     @staticmethod
     def run(client, playerPath, filePath, args):
@@ -22,26 +35,41 @@ class MpvPlayer(MplayerPlayer):
             ver = MpvPlayer.RE_VERSION.search(subprocess.check_output([playerPath, '--version']).decode('utf-8'))
         except:
             ver = None
-        constants.MPV_NEW_VERSION = ver is None or int(ver.group(1)) > 0 or int(ver.group(2)) >= 6
+        constants.MPV_NEW_VERSION = ver is None or int(ver.group(1)) > 0 or int(ver.group(2)) >= 23
+        if not constants.MPV_NEW_VERSION:
+            from twisted.internet import reactor
+            the_reactor = reactor
+            the_reactor.callFromThread(client.ui.showErrorMessage,
+                                        "This version of mpv is not compatible with Syncplay. "
+                                        "Please use mpv >=0.23.0.", True)
+            the_reactor.callFromThread(client.stop)
+            return
+
         constants.MPV_OSC_VISIBILITY_CHANGE_VERSION = False if ver is None else int(ver.group(1)) > 0 or int(ver.group(2)) >= 28
         if not constants.MPV_OSC_VISIBILITY_CHANGE_VERSION:
             client.ui.showDebugMessage(
                 "This version of mpv is not known to be compatible with changing the OSC visibility. "
                 "Please use mpv >=0.28.0.")
-        if constants.MPV_NEW_VERSION:
+        return MpvPlayer(client, MpvPlayer.getExpandedPath(playerPath), filePath, args)
-            return NewMpvPlayer(client, MpvPlayer.getExpandedPath(playerPath), filePath, args)
-        else:
-            return OldMpvPlayer(client, MpvPlayer.getExpandedPath(playerPath), filePath, args)
 
     @staticmethod
-    def getStartupArgs(path, userArgs):
+    def getStartupArgs(userArgs):
         args = constants.MPV_ARGS
+        args["script"] = findResourcePath("syncplayintf.lua")
         if userArgs:
-            args.extend(userArgs)
+            for argToAdd in userArgs:
-        args.extend(constants.MPV_SLAVE_ARGS)
+                if argToAdd.startswith('--'):
-        if constants.MPV_NEW_VERSION:
+                    argToAdd = argToAdd[2:]
-            args.extend(constants.MPV_SLAVE_ARGS_NEW)
+                elif argToAdd.startswith('-'):
-            args.extend(["--script={}".format(findResourcePath("syncplayintf.lua"))])
+                    argToAdd = argToAdd[1:]
+                if argToAdd.strip() == "":
+                    continue
+                if "=" in argToAdd:
+                    (argName, argValue) = argToAdd.split("=")
+                else:
+                    argName = argToAdd
+                    argValue = "yes"
+                args[argName] = argValue
         return args
 
     @staticmethod
@@ -83,18 +111,8 @@ class MpvPlayer(MplayerPlayer):
     def getPlayerPathErrors(playerPath, filePath):
         return None
 
-
-class OldMpvPlayer(MpvPlayer):
-    POSITION_QUERY = 'time-pos'
-    OSD_QUERY = 'show_text'
-
     def _setProperty(self, property_, value):
-        self._listener.sendLine("no-osd set {} {}".format(property_, value))
+        self._listener.sendLine(["set_property", property_, value])
-
-    def setPaused(self, value):
-        if self._paused != value:
-            self._paused = not self._paused
-            self._listener.sendLine('cycle pause')
 
     def mpvErrorCheck(self, line):
         if "Error parsing option" in line or "Error parsing commandline option" in line:
@@ -107,41 +125,30 @@ class OldMpvPlayer(MpvPlayer):
         if constants and any(errormsg in line for errormsg in constants.MPV_ERROR_MESSAGES_TO_REPEAT):
             self._client.ui.showErrorMessage(line)
 
-    def _handleUnknownLine(self, line):
-        self.mpvErrorCheck(line)
-        if "Playing: " in line:
-            newpath = line[9:]
-            oldpath = self._filepath
-            if newpath != oldpath and oldpath is not None:
-                self.reactor.callFromThread(self._onFileUpdate)
-                if self._paused != self._client.getGlobalPaused():
-                    self.setPaused(self._client.getGlobalPaused())
-                self.setPosition(self._client.getGlobalPosition())
-
-
-class NewMpvPlayer(OldMpvPlayer):
-    lastResetTime = None
-    lastMPVPositionUpdate = None
-    alertOSDSupported = True
-    chatOSDSupported = True
-
     def displayMessage(self, message, duration=(constants.OSD_DURATION * 1000), OSDType=constants.OSD_NOTIFICATION,
                        mood=constants.MESSAGE_NEUTRAL):
         if not self._client._config["chatOutputEnabled"]:
-            MplayerPlayer.displayMessage(self, message=message, duration=duration, OSDType=OSDType, mood=mood)
+            messageString = self._sanitizeText(message.replace("\\n", "<NEWLINE>")).replace("<NEWLINE>", "\\n")
+            self._listener.mpvpipe.show_text(messageString, duration, constants.MPLAYER_OSD_LEVEL)
             return
         messageString = self._sanitizeText(message.replace("\\n", "<NEWLINE>")).replace(
             "\\\\", constants.MPV_INPUT_BACKSLASH_SUBSTITUTE_CHARACTER).replace("<NEWLINE>", "\\n")
-        self._listener.sendLine('script-message-to syncplayintf {}-osd-{} "{}"'.format(OSDType, mood, messageString))
+        self._listener.sendLine(["script-message-to", "syncplayintf", "{}-osd-{}".format(OSDType, mood), messageString])
 
     def displayChatMessage(self, username, message):
         if not self._client._config["chatOutputEnabled"]:
-            MplayerPlayer.displayChatMessage(self, username, message)
+            messageString = "<{}> {}".format(username, message)
+            messageString = self._sanitizeText(messageString.replace("\\n", "<NEWLINE>")).replace("<NEWLINE>", "\\n")
+            duration = int(constants.OSD_DURATION * 1000)
+            self._listener.mpvpipe.show_text(messageString, duration, constants.MPLAYER_OSD_LEVEL)
             return
         username = self._sanitizeText(username.replace("\\", constants.MPV_INPUT_BACKSLASH_SUBSTITUTE_CHARACTER))
         message = self._sanitizeText(message.replace("\\", constants.MPV_INPUT_BACKSLASH_SUBSTITUTE_CHARACTER))
         messageString = "<{}> {}".format(username, message)
-        self._listener.sendLine('script-message-to syncplayintf chat "{}"'.format(messageString))
+        self._listener.sendLine(["script-message-to", "syncplayintf", "chat", messageString])
+
+    def setSpeed(self, value):
+        self._setProperty('speed', "{:.2f}".format(value))
 
     def setPaused(self, value):
         if self._paused == value:
@@ -153,6 +160,15 @@ class NewMpvPlayer(OldMpvPlayer):
         if value == False:
             self.lastMPVPositionUpdate = time.time()
 
+    def _getFilename(self):
+        self._getProperty('filename')
+
+    def _getLength(self):
+        self._getProperty('length')
+
+    def _getFilepath(self):
+        self._getProperty('path')
+
     def _getProperty(self, property_):
         floatProperties = ['time-pos']
         if property_ in floatProperties:
@@ -161,7 +177,7 @@ class NewMpvPlayer(OldMpvPlayer):
             propertyID = '=duration:${=length:0}'
         else:
             propertyID = property_
-        self._listener.sendLine("print_text ""ANS_{}=${{{}}}""".format(property_, propertyID))
+        self._listener.sendLine(["print_text", '"ANS_{}=${{{}}}"'.format(property_, propertyID)])
 
     def getCalculatedPosition(self):
         if self.fileLoaded == False:
@@ -197,22 +213,92 @@ class NewMpvPlayer(OldMpvPlayer):
             return self._position
 
     def _storePosition(self, value):
+        if value is None:
+            self._client.ui.showDebugMessage("NONE TYPE POSITION!")
+            return
+
+        if self._client.isPlayingMusic() and self._paused == False and self._position == value and abs(self._position-self._position) < 0.5:
+            self._client.ui.showDebugMessage("EOF DETECTED!")
+            self._position = 0
+            self.setPosition(0)
         self.lastMPVPositionUpdate = time.time()
         if self._recentlyReset():
             self._client.ui.showDebugMessage("Recently reset, so storing position as 0")
             self._position = 0
         elif self._fileIsLoaded() or (value < constants.MPV_NEWFILE_IGNORE_TIME and self._fileIsLoaded(ignoreDelay=True)):
+            old_position = float(self._position)
             self._position = max(value, 0)
+            #self._client.ui.showDebugMessage("Position changed from {} to {}".format(old_position, self._position))
         else:
             self._client.ui.showDebugMessage(
-                "No file loaded so storing position as GlobalPosition ({})".format(self._client.getGlobalPosition()))
+                "No file loaded so storing position {} as GlobalPosition ({})".format(value, self._client.getGlobalPosition()))
             self._position = self._client.getGlobalPosition()
 
     def _storePauseState(self, value):
+        if value is None:
+            self._client.ui.showDebugMessage("NONE TYPE PAUSE STATE!")
+            return
         if self._fileIsLoaded():
             self._paused = value
+            #self._client.ui.showDebugMessage("PAUSE STATE STORED AS {}".format(self._paused))
         else:
             self._paused = self._client.getGlobalPaused()
+            #self._client.ui.showDebugMessage("STORING GLOBAL PAUSED AS FILE IS NOT LOADED")
+
+
+    def lineReceived(self, line):
+        if line:
+            self._client.ui.showDebugMessage("player << {}".format(line))
+            line = line.replace("[cplayer] ", "")  # -v workaround
+            line = line.replace("[term-msg] ", "")  # -v workaround
+            line = line.replace("   cplayer: ", "")  # --msg-module workaround
+            line = line.replace("  term-msg: ", "")
+        if (
+            "Failed to get value of property" in line or
+            "=(unavailable)" in line or
+            line == "ANS_filename=" or
+            line == "ANS_length=" or
+            line == "ANS_path="
+        ):
+            if "filename" in line:
+                self._getFilename()
+            elif "length" in line:
+                self._getLength()
+            elif "path" in line:
+                self._getFilepath()
+            return
+        match = self.RE_ANSWER.match(line)
+        if not match:
+            self._handleUnknownLine(line)
+            return
+
+        name, value = [m for m in match.groups() if m]
+        name = name.lower()
+
+        if name == self.POSITION_QUERY:
+            self._storePosition(float(value))
+            self._positionAsk.set()
+        elif name == "pause":
+            self._storePauseState(bool(value == 'yes'))
+            self._pausedAsk.set()
+        elif name == "length":
+            try:
+                self._duration = float(value)
+            except:
+                self._duration = 0
+            self._durationAsk.set()
+        elif name == "path":
+            self._filepath = value
+            self._pathAsk.set()
+        elif name == "filename":
+            self._filename = value
+            self._filenameAsk.set()
+        elif name == "exiting":
+            if value != 'Quit':
+                if self.quitReason is None:
+                    self.quitReason = getMessage("media-player-error").format(value)
+                self.reactor.callFromThread(self._client.ui.showErrorMessage, self.quitReason, True)
+            self.drop()
 
     def askForStatus(self):
         self._positionAsk.clear()
@@ -227,8 +313,53 @@ class NewMpvPlayer(OldMpvPlayer):
         self._client.updatePlayerStatus(
             self._paused if self.fileLoaded else self._client.getGlobalPaused(), self.getCalculatedPosition())
 
+    def drop(self):
+        try:
+            self._listener.sendLine(['quit'])
+        except AttributeError as e:
+            self._client.ui.showDebugMessage("Could not send quit message: {}".format(str(e)))
+        self._takeLocksDown()
+        self.reactor.callFromThread(self._client.stop, False)
+
+    def _takeLocksDown(self):
+        try:
+            self._durationAsk.set()
+            self._filenameAsk.set()
+            self._pathAsk.set()
+            self._positionAsk.set()
+            self._pausedAsk.set()
+        except:
+            pass
+
+
     def _getPausedAndPosition(self):
-        self._listener.sendLine("print_text ANS_pause=${pause}\r\nprint_text ANS_time-pos=${=time-pos}")
+        self._listener.sendLine(["script-message-to", "syncplayintf", "get_paused_and_position"])
+
+    def _getPaused(self):
+        self._getProperty('pause')
+
+    def _getPosition(self):
+        self._getProperty(self.POSITION_QUERY)
+
+    def _sanitizeText(self, text):
+        text = text.replace("\r", "")
+        text = text.replace("\n", "")
+        text = text.replace("\\\"", "<SYNCPLAY_QUOTE>")
+        text = text.replace("\"", "<SYNCPLAY_QUOTE>")
+        text = text.replace("%", "%%")
+        text = text.replace("\\", "\\\\")
+        text = text.replace("{", "\\\\{")
+        text = text.replace("}", "\\\\}")
+        text = text.replace("<SYNCPLAY_QUOTE>", "\\\"")
+        return text
+
+    def _quoteArg(self, arg):
+        arg = arg.replace('\\', '\\\\')
+        arg = arg.replace("'", "\\'")
+        arg = arg.replace('"', '\\"')
+        arg = arg.replace("\r", "")
+        arg = arg.replace("\n", "")
+        return '"{}"'.format(arg)
 
     def _preparePlayer(self):
         if self.delayedFilePath:
@@ -242,7 +373,7 @@ class NewMpvPlayer(OldMpvPlayer):
 
     def _loadFile(self, filePath):
         self._clearFileLoaded()
-        self._listener.sendLine('loadfile {}'.format(self._quoteArg(filePath)), notReadyAfterThis=True)
+        self._listener.sendLine(['loadfile', filePath], notReadyAfterThis=True)
 
     def setFeatures(self, featureList):
         self.sendMpvOptions()
@@ -252,7 +383,11 @@ class NewMpvPlayer(OldMpvPlayer):
             self._client.ui.showDebugMessage(
                 "Did not seek as recently reset and {} below 'do not reset position' threshold".format(value))
             return
-        MplayerPlayer.setPosition(self, value)
+        self._position = max(value, 0)
+        self._client.ui.showDebugMessage(
+            "Setting position to {}...".format(self._position))
+        self._setProperty(self.POSITION_QUERY, "{}".format(value))
+        time.sleep(0.03)
         self.lastMPVPositionUpdate = time.time()
 
     def openFile(self, filePath, resetPosition=False):
@@ -260,6 +395,7 @@ class NewMpvPlayer(OldMpvPlayer):
         if resetPosition:
             self.lastResetTime = time.time()
             if isURL(filePath):
+                self._client.ui.showDebugMessage("Setting additional lastResetTime due to stream")
                 self.lastResetTime += constants.STREAM_ADDITIONAL_IGNORE_TIME
         self._loadFile(filePath)
         if self._paused != self._client.getGlobalPaused():
@@ -267,9 +403,11 @@ class NewMpvPlayer(OldMpvPlayer):
         else:
             self._client.ui.showDebugMessage("Don't want to set paused to {}".format(self._client.getGlobalPaused()))
         if resetPosition == False:
+            self._client.ui.showDebugMessage("OpenFile setting position to global position: {}".format(self._client.getGlobalPosition()))
             self.setPosition(self._client.getGlobalPosition())
         else:
             self._storePosition(0)
+        # TO TRY: self._listener.setReadyToSend(False)
 
     def sendMpvOptions(self):
         options = []
@@ -281,7 +419,7 @@ class NewMpvPlayer(OldMpvPlayer):
             options.append("{}={}".format(option, getMessage(option)))
         options.append("OscVisibilityChangeCompatible={}".format(constants.MPV_OSC_VISIBILITY_CHANGE_VERSION))
         options_string = ", ".join(options)
-        self._listener.sendLine('script-message-to syncplayintf set_syncplayintf_options "{}"'.format(options_string))
+        self._listener.sendLine(["script-message-to", "syncplayintf", "set_syncplayintf_options",  options_string])
         self._setOSDPosition()
 
     def _handleUnknownLine(self, line):
@@ -291,18 +429,37 @@ class NewMpvPlayer(OldMpvPlayer):
             line = line.replace(constants.MPV_INPUT_BACKSLASH_SUBSTITUTE_CHARACTER, "\\")
             self._listener.sendChat(line[6:-7])
 
+        if "<paused=" in line and ", pos=" in line:
+            update_string = line.replace(">", "<").replace("=", "<").replace(", ", "<").split("<")
+            paused_update = update_string[2]
+            position_update = update_string[4]
+            if paused_update == "nil":
+                self._storePauseState(True)
+            else:
+                self._storePauseState(bool(paused_update == 'true'))
+            self._pausedAsk.set()
+            if position_update == "nil":
+                self._storePosition(float(0))
+            else:
+                self._storePosition(float(position_update))
+            self._positionAsk.set()
+            #self._client.ui.showDebugMessage("{} = {} / {}".format(update_string, paused_update, position_update))
+
         if "<get_syncplayintf_options>" in line:
             self.sendMpvOptions()
 
         if line == "<SyncplayUpdateFile>" or "Playing:" in line:
+            self._client.ui.showDebugMessage("Not ready to send due to <SyncplayUpdateFile>")
             self._listener.setReadyToSend(False)
             self._clearFileLoaded()
 
         elif line == "</SyncplayUpdateFile>":
             self._onFileUpdate()
             self._listener.setReadyToSend(True)
+            self._client.ui.showDebugMessage("Ready to send due to </SyncplayUpdateFile>")
 
         elif "Failed" in line or "failed" in line or "No video or audio streams selected" in line or "error" in line:
+            self._client.ui.showDebugMessage("Not ready to send due to error")
             self._listener.setReadyToSend(True)
 
     def _setOSDPosition(self):
@@ -326,12 +483,15 @@ class NewMpvPlayer(OldMpvPlayer):
             return False
 
     def _onFileUpdate(self):
+        self._client.ui.showDebugMessage("File update")
         self.fileLoaded = True
         self.lastLoadedTime = time.time()
         self.reactor.callFromThread(self._client.updateFile, self._filename, self._duration, self._filepath)
         if not (self._recentlyReset()):
+            self._client.ui.showDebugMessage("onFileUpdate setting position to global position: {}".format(self._client.getGlobalPosition()))
             self.reactor.callFromThread(self.setPosition, self._client.getGlobalPosition())
         if self._paused != self._client.getGlobalPaused():
+            self._client.ui.showDebugMessage("onFileUpdate setting position to global paused: {}".format(self._client.getGlobalPaused()))
             self.reactor.callFromThread(self._client.getGlobalPaused)
 
     def _fileIsLoaded(self, ignoreDelay=False):
@@ -343,3 +503,227 @@ class NewMpvPlayer(OldMpvPlayer):
             self.fileLoaded and self.lastLoadedTime is not None and
             time.time() > (self.lastLoadedTime + constants.MPV_NEWFILE_IGNORE_TIME)
         )
+
+
+    def __init__(self, client, playerPath, filePath, args):
+        from twisted.internet import reactor
+        self.reactor = reactor
+        self._client = client
+        self._paused = None
+        self._position = 0.0
+        self._duration = None
+        self._filename = None
+        self._filepath = None
+        self.quitReason = None
+        self.lastLoadedTime = None
+        self.fileLoaded = False
+        self.delayedFilePath = None
+        try:
+            self._listener = self.__Listener(self, playerPath, filePath, args)
+        except ValueError:
+            self._client.ui.showMessage(getMessage("mplayer-file-required-notification"))
+            self._client.ui.showMessage(getMessage("mplayer-file-required-notification/example"))
+            self.drop()
+            return
+        except AttributeError as e:
+            self._client.ui.showErrorMessage("Could not load mpv: " + str(e))
+            return
+        self._listener.setDaemon(True)
+        self._listener.start()
+
+        self._durationAsk = threading.Event()
+        self._filenameAsk = threading.Event()
+        self._pathAsk = threading.Event()
+
+        self._positionAsk = threading.Event()
+        self._pausedAsk = threading.Event()
+
+        self._preparePlayer()
+
+    def _fileUpdateClearEvents(self):
+        self._durationAsk.clear()
+        self._filenameAsk.clear()
+        self._pathAsk.clear()
+
+    def _fileUpdateWaitEvents(self):
+        self._durationAsk.wait()
+        self._filenameAsk.wait()
+        self._pathAsk.wait()
+
+    def mpv_log_handler(self, level, prefix, text):
+        self.lineReceived(text)
+
+    class __Listener(threading.Thread):
+        def __init__(self, playerController, playerPath, filePath, args):
+            self.playerPath = playerPath
+            self.mpv_arguments = playerController.getStartupArgs(args)
+            self.mpv_running = True
+            self.sendQueue = []
+            self.readyToSend = True
+            self.lastSendTime = None
+            self.lastNotReadyTime = None
+            self.__playerController = playerController
+            if not self.__playerController._client._config["chatOutputEnabled"]:
+                self.__playerController.alertOSDSupported = False
+                self.__playerController.chatOSDSupported = False
+            if self.__playerController.getPlayerPathErrors(playerPath, filePath):
+                raise ValueError()
+            if filePath and '://' not in filePath:
+                if not os.path.isfile(filePath) and 'PWD' in os.environ:
+                    filePath = os.environ['PWD'] + os.path.sep + filePath
+                filePath = os.path.realpath(filePath)
+
+            if filePath:
+                self.__playerController.delayedFilePath = filePath
+
+            # At least mpv may output escape sequences which result in syncplay
+            # trying to parse something like
+            # "\x1b[?1l\x1b>ANS_filename=blah.mkv". Work around this by
+            # unsetting TERM.
+            env = os.environ.copy()
+            if 'TERM' in env:
+                del env['TERM']
+            # On macOS, youtube-dl requires system python to run. Set the environment
+            # to allow that version of python to be executed in the mpv subprocess.
+            if isMacOS():
+                try:
+                    pythonLibs = subprocess.check_output(['/usr/bin/python', '-E', '-c',
+                                                          'import sys; print(sys.path)'],
+                                                          text=True, env=dict())
+                    pythonLibs = ast.literal_eval(pythonLibs)
+                    pythonPath = ':'.join(pythonLibs[1:])
+                except:
+                    pythonPath = None
+                if pythonPath is not None:
+                    env['PATH'] = '/usr/bin:/usr/local/bin'
+                    env['PYTHONPATH'] = pythonPath
+            try:
+                self.mpvpipe = MPV(mpv_location=self.playerPath, loglevel="info", log_handler=self.__playerController.mpv_log_handler, quit_callback=self.stop_client, **self.mpv_arguments)
+            except Exception as e:
+                self.quitReason = getMessage("media-player-error").format(str(e)) + " " + getMessage("mpv-failed-advice")
+                self.__playerController.reactor.callFromThread(self.__playerController._client.ui.showErrorMessage, self.quitReason, True)
+                self.__playerController.drop()
+            self.__process = self.mpvpipe
+            #self.mpvpipe.show_text("HELLO WORLD!", 1000)
+            threading.Thread.__init__(self, name="MPV Listener")
+
+        def __getCwd(self, filePath, env):
+            if not filePath:
+                return None
+            if os.path.isfile(filePath):
+                cwd = os.path.dirname(filePath)
+            elif 'HOME' in env:
+                cwd = env['HOME']
+            elif 'APPDATA' in env:
+                cwd = env['APPDATA']
+            else:
+                cwd = None
+            return cwd
+
+        def run(self):
+            pass
+
+        def sendChat(self, message):
+            if message:
+                if message[:1] == "/" and message != "/":
+                    command = message[1:]
+                    if command and command[:1] == "/":
+                        message = message[1:]
+                    else:
+                        self.__playerController.reactor.callFromThread(
+                            self.__playerController._client.ui.executeCommand, command)
+                        return
+                self.__playerController.reactor.callFromThread(self.__playerController._client.sendChat, message)
+
+        def isReadyForSend(self):
+            self.checkForReadinessOverride()
+            return self.readyToSend
+
+        def setReadyToSend(self, newReadyState):
+            oldState = self.readyToSend
+            self.readyToSend = newReadyState
+            self.lastNotReadyTime = time.time() if newReadyState == False else None
+            if self.readyToSend == True:
+                self.__playerController._client.ui.showDebugMessage("<mpv> Ready to send: True")
+            else:
+                self.__playerController._client.ui.showDebugMessage("<mpv> Ready to send: False")
+            if self.readyToSend == True and oldState == False:
+                self.processSendQueue()
+
+        def checkForReadinessOverride(self):
+            if self.lastNotReadyTime and time.time() - self.lastNotReadyTime > constants.MPV_MAX_NEWFILE_COOLDOWN_TIME:
+                self.setReadyToSend(True)
+
+        def sendLine(self, line, notReadyAfterThis=None):
+            self.checkForReadinessOverride()
+            try:
+                if self.sendQueue:
+                    if constants.MPV_SUPERSEDE_IF_DUPLICATE_COMMANDS:
+                        for command in constants.MPV_SUPERSEDE_IF_DUPLICATE_COMMANDS:
+                            line_command = " ".join(line)
+                            answer = line_command.startswith(command)
+                            #self.__playerController._client.ui.showDebugMessage("Does line_command {} start with {}? {}".format(line_command, command, answer))
+                            if line_command.startswith(command):
+                                for itemID, deletionCandidate in enumerate(self.sendQueue):
+                                    if " ".join(deletionCandidate).startswith(command):
+                                        self.__playerController._client.ui.showDebugMessage(
+                                            "<mpv> Remove duplicate (supersede): {}".format(self.sendQueue[itemID]))
+                                        try:
+                                            self.sendQueue.remove(self.sendQueue[itemID])
+                                        except UnicodeWarning:
+                                            self.__playerController._client.ui.showDebugMessage(
+                                                "<mpv> Unicode mismatch occured when trying to remove duplicate")
+                                            # TODO: Prevent this from being triggered
+                                            pass
+                                        break
+                            break
+                    if constants.MPV_REMOVE_BOTH_IF_DUPLICATE_COMMANDS:
+                        for command in constants.MPV_REMOVE_BOTH_IF_DUPLICATE_COMMANDS:
+                            if line == command:
+                                for itemID, deletionCandidate in enumerate(self.sendQueue):
+                                    if deletionCandidate == command:
+                                        self.__playerController._client.ui.showDebugMessage(
+                                            "<mpv> Remove duplicate (delete both): {}".format(self.sendQueue[itemID]))
+                                        self.__playerController._client.ui.showDebugMessage(self.sendQueue[itemID])
+                                        return
+            except Exception as e:
+                self.__playerController._client.ui.showDebugMessage("<mpv> Problem removing duplicates, etc: {}".format(e))
+            self.sendQueue.append(line)
+            self.processSendQueue()
+            if notReadyAfterThis:
+                self.setReadyToSend(False)
+
+        def processSendQueue(self):
+            while self.sendQueue and self.readyToSend:
+                if self.lastSendTime and time.time() - self.lastSendTime < constants.MPV_SENDMESSAGE_COOLDOWN_TIME:
+                    self.__playerController._client.ui.showDebugMessage(
+                        "<mpv> Throttling message send, so sleeping for {}".format(
+                            constants.MPV_SENDMESSAGE_COOLDOWN_TIME))
+                    time.sleep(constants.MPV_SENDMESSAGE_COOLDOWN_TIME)
+                try:
+                    lineToSend = self.sendQueue.pop()
+                    if lineToSend:
+                        self.lastSendTime = time.time()
+                        self.actuallySendLine(lineToSend)
+                except IndexError:
+                    pass
+
+        def stop_client(self):
+            self.readyToSend = False
+            try:
+                self.mpvpipe.terminate()
+            except: #When mpv is already closed
+                pass
+            self.__playerController._takeLocksDown()
+            self.__playerController.reactor.callFromThread(self.__playerController._client.stop, False)
+
+        def actuallySendLine(self, line):
+            try:
+                self.__playerController._client.ui.showDebugMessage("player >> {}".format(line))
+                try:
+                    self.mpvpipe.command(*line)
+                except Exception as e:
+                    self.__playerController._client.ui.showDebugMessage("CANNOT SEND {} DUE TO {}".format(line, e))
+                    self.stop_client()
+            except IOError:
+                pass

syncplay/players/mpvnet.py

@@ -1,8 +1,8 @@
 import os
 from syncplay import constants
-from syncplay.players.mpv import NewMpvPlayer
+from syncplay.players.mpv import MpvPlayer
 
-class MpvnetPlayer(NewMpvPlayer):
+class MpvnetPlayer(MpvPlayer):
 
 
     @staticmethod

syncplay/players/python_mpv_jsonipc/LICENSE.md

@@ -0,0 +1,195 @@
+Apache License
+==============
+
+_Version 2.0, January 2004_  
+_&lt;<http://www.apache.org/licenses/>&gt;_
+
+### Terms and Conditions for use, reproduction, and distribution
+
+#### 1. Definitions
+
+“License” shall mean the terms and conditions for use, reproduction, and
+distribution as defined by Sections 1 through 9 of this document.
+
+“Licensor” shall mean the copyright owner or entity authorized by the copyright
+owner that is granting the License.
+
+“Legal Entity” shall mean the union of the acting entity and all other entities
+that control, are controlled by, or are under common control with that entity.
+For the purposes of this definition, “control” means **(i)** the power, direct or
+indirect, to cause the direction or management of such entity, whether by
+contract or otherwise, or **(ii)** ownership of fifty percent (50%) or more of the
+outstanding shares, or **(iii)** beneficial ownership of such entity.
+
+“You” (or “Your”) shall mean an individual or Legal Entity exercising
+permissions granted by this License.
+
+“Source” form shall mean the preferred form for making modifications, including
+but not limited to software source code, documentation source, and configuration
+files.
+
+“Object” form shall mean any form resulting from mechanical transformation or
+translation of a Source form, including but not limited to compiled object code,
+generated documentation, and conversions to other media types.
+
+“Work” shall mean the work of authorship, whether in Source or Object form, made
+available under the License, as indicated by a copyright notice that is included
+in or attached to the work (an example is provided in the Appendix below).
+
+“Derivative Works” shall mean any work, whether in Source or Object form, that
+is based on (or derived from) the Work and for which the editorial revisions,
+annotations, elaborations, or other modifications represent, as a whole, an
+original work of authorship. For the purposes of this License, Derivative Works
+shall not include works that remain separable from, or merely link (or bind by
+name) to the interfaces of, the Work and Derivative Works thereof.
+
+“Contribution” shall mean any work of authorship, including the original version
+of the Work and any modifications or additions to that Work or Derivative Works
+thereof, that is intentionally submitted to Licensor for inclusion in the Work
+by the copyright owner or by an individual or Legal Entity authorized to submit
+on behalf of the copyright owner. For the purposes of this definition,
+“submitted” means any form of electronic, verbal, or written communication sent
+to the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control systems, and
+issue tracking systems that are managed by, or on behalf of, the Licensor for
+the purpose of discussing and improving the Work, but excluding communication
+that is conspicuously marked or otherwise designated in writing by the copyright
+owner as “Not a Contribution.”
+
+“Contributor” shall mean Licensor and any individual or Legal Entity on behalf
+of whom a Contribution has been received by Licensor and subsequently
+incorporated within the Work.
+
+#### 2. Grant of Copyright License
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute the Work and such
+Derivative Works in Source or Object form.
+
+#### 3. Grant of Patent License
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable (except as stated in this section) patent license to make, have
+made, use, offer to sell, sell, import, and otherwise transfer the Work, where
+such license applies only to those patent claims licensable by such Contributor
+that are necessarily infringed by their Contribution(s) alone or by combination
+of their Contribution(s) with the Work to which such Contribution(s) was
+submitted. If You institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Work or a
+Contribution incorporated within the Work constitutes direct or contributory
+patent infringement, then any patent licenses granted to You under this License
+for that Work shall terminate as of the date such litigation is filed.
+
+#### 4. Redistribution
+
+You may reproduce and distribute copies of the Work or Derivative Works thereof
+in any medium, with or without modifications, and in Source or Object form,
+provided that You meet the following conditions:
+
+* **(a)** You must give any other recipients of the Work or Derivative Works a copy of
+this License; and
+* **(b)** You must cause any modified files to carry prominent notices stating that You
+changed the files; and
+* **(c)** You must retain, in the Source form of any Derivative Works that You distribute,
+all copyright, patent, trademark, and attribution notices from the Source form
+of the Work, excluding those notices that do not pertain to any part of the
+Derivative Works; and
+* **(d)** If the Work includes a “NOTICE” text file as part of its distribution, then any
+Derivative Works that You distribute must include a readable copy of the
+attribution notices contained within such NOTICE file, excluding those notices
+that do not pertain to any part of the Derivative Works, in at least one of the
+following places: within a NOTICE text file distributed as part of the
+Derivative Works; within the Source form or documentation, if provided along
+with the Derivative Works; or, within a display generated by the Derivative
+Works, if and wherever such third-party notices normally appear. The contents of
+the NOTICE file are for informational purposes only and do not modify the
+License. You may add Your own attribution notices within Derivative Works that
+You distribute, alongside or as an addendum to the NOTICE text from the Work,
+provided that such additional attribution notices cannot be construed as
+modifying the License.
+
+You may add Your own copyright statement to Your modifications and may provide
+additional or different license terms and conditions for use, reproduction, or
+distribution of Your modifications, or for any such Derivative Works as a whole,
+provided Your use, reproduction, and distribution of the Work otherwise complies
+with the conditions stated in this License.
+
+#### 5. Submission of Contributions
+
+Unless You explicitly state otherwise, any Contribution intentionally submitted
+for inclusion in the Work by You to the Licensor shall be under the terms and
+conditions of this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify the terms of
+any separate license agreement you may have executed with Licensor regarding
+such Contributions.
+
+#### 6. Trademarks
+
+This License does not grant permission to use the trade names, trademarks,
+service marks, or product names of the Licensor, except as required for
+reasonable and customary use in describing the origin of the Work and
+reproducing the content of the NOTICE file.
+
+#### 7. Disclaimer of Warranty
+
+Unless required by applicable law or agreed to in writing, Licensor provides the
+Work (and each Contributor provides its Contributions) on an “AS IS” BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
+including, without limitation, any warranties or conditions of TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
+solely responsible for determining the appropriateness of using or
+redistributing the Work and assume any risks associated with Your exercise of
+permissions under this License.
+
+#### 8. Limitation of Liability
+
+In no event and under no legal theory, whether in tort (including negligence),
+contract, or otherwise, unless required by applicable law (such as deliberate
+and grossly negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special, incidental,
+or consequential damages of any character arising as a result of this License or
+out of the use or inability to use the Work (including but not limited to
+damages for loss of goodwill, work stoppage, computer failure or malfunction, or
+any and all other commercial damages or losses), even if such Contributor has
+been advised of the possibility of such damages.
+
+#### 9. Accepting Warranty or Additional Liability
+
+While redistributing the Work or Derivative Works thereof, You may choose to
+offer, and charge a fee for, acceptance of support, warranty, indemnity, or
+other liability obligations and/or rights consistent with this License. However,
+in accepting such obligations, You may act only on Your own behalf and on Your
+sole responsibility, not on behalf of any other Contributor, and only if You
+agree to indemnify, defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by reason of your
+accepting any such warranty or additional liability.
+
+_END OF TERMS AND CONDITIONS_
+
+### APPENDIX: How to apply the Apache License to your work
+
+To apply the Apache License to your work, attach the following boilerplate
+notice, with the fields enclosed by brackets `[]` replaced with your own
+identifying information. (Don't include the brackets!) The text should be
+enclosed in the appropriate comment syntax for the file format. We also
+recommend that a file or class name and description of purpose be included on
+the same “printed page” as the copyright notice for easier identification within
+third-party archives.
+
+    Copyright [yyyy] [name of copyright owner]
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+      http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+

syncplay/players/python_mpv_jsonipc/README.md

@@ -0,0 +1,56 @@
+# Python MPV JSONIPC
+
+This implements an interface similar to `python-mpv`, but it uses the JSON IPC protocol instead of the C API. This means
+you can control external instances of MPV including players like SMPlayer, and it can use MPV players that are prebuilt
+instead of needing `libmpv1`. It may also be more resistant to crashes such as Segmentation Faults, but since it isn't
+directly communicating with MPV via the C API the performance will be worse.
+
+Please note that this only implements the subset of `python-mpv` that is used by `plex-mpv-shim` and
+`jellyfin-mpv-shim`. Other functionality has not been implemented.
+
+## Installation
+
+```bash
+sudo pip3 install python-mpv-jsonipc
+```
+
+## Basic usage
+
+Create an instance of MPV. You can use an already running MPV or have the library start a
+managed copy of MPV. Command arguments can be specified when initializing MPV if you are
+starting a managed copy of MPV.
+
+Please also see the [API Documentation](https://github.com/iwalton3/python-mpv-jsonipc/blob/master/docs.md).
+
+```python
+from python_mpv_jsonipc import MPV
+
+# Uses MPV that is in the PATH.
+mpv = MPV()
+
+# Use MPV that is running and connected to /tmp/mpv-socket.
+mpv = MPV(start_mpv=False, ipc_socket="/tmp/mpv-socket")
+
+# Uses MPV that is found at /path/to/mpv.
+mpv = MPV(mpv_location="/path/to/mpv")
+
+# After you have an MPV, you can read and set (if applicable) properties.
+mpv.volume # 100.0 by default
+mpv.volume = 20 
+
+# You can also send commands.
+mpv.command_name(arg1, arg2)
+
+# Bind to key press events with a decorator
+@mpv.on_key_press("space")
+def space_handler():
+    pass
+
+# You can also observe and wait for properties.
+@mpv.property_observer("eof-reached")
+def handle_eof(name, value):
+    pass
+
+# Or simply wait for the value to change once.
+mpv.wait_for_property("duration")
+```

syncplay/players/python_mpv_jsonipc/docs.md

@@ -0,0 +1,460 @@
+<a name=".python_mpv_jsonipc"></a>
+
+## python\_mpv\_jsonipc
+
+<a name=".python_mpv_jsonipc.MPVError"></a>
+
+### MPVError
+
+``` python
+class MPVError(Exception):
+ |  MPVError(**args, ****kwargs)
+```
+
+An error originating from MPV or due to a problem with MPV.
+
+<a name=".python_mpv_jsonipc.WindowsSocket"></a>
+
+### WindowsSocket
+
+``` python
+class WindowsSocket(threading.Thread)
+```
+
+Wraps a Windows named pipe in a high-level interface. (Internal)
+
+Data is automatically encoded and decoded as JSON. The callback  
+function will be called for each inbound message.
+
+<a name=".python_mpv_jsonipc.WindowsSocket.__init__"></a>
+
+#### \_\_init\_\_
+
+``` python
+ | __init__(ipc_socket, callback=None, quit_callback=None)
+```
+
+Create the wrapper.
+
+**ipc\_socket** is the pipe name. (Not including \\\\.\\pipe\\)  
+**callback(json\_data)** is the function for recieving events.
+
+<a name=".python_mpv_jsonipc.WindowsSocket.stop"></a>
+
+#### stop
+
+``` python
+ | stop()
+```
+
+Terminate the thread.
+
+<a name=".python_mpv_jsonipc.WindowsSocket.send"></a>
+
+#### send
+
+``` python
+ | send(data)
+```
+
+Send **data** to the pipe, encoded as JSON.
+
+<a name=".python_mpv_jsonipc.WindowsSocket.run"></a>
+
+#### run
+
+``` python
+ | run()
+```
+
+Process pipe events. Do not run this directly. Use **start**.
+
+<a name=".python_mpv_jsonipc.UnixSocket"></a>
+
+### UnixSocket
+
+``` python
+class UnixSocket(threading.Thread)
+```
+
+Wraps a Unix/Linux socket in a high-level interface. (Internal)
+
+Data is automatically encoded and decoded as JSON. The callback  
+function will be called for each inbound message.
+
+<a name=".python_mpv_jsonipc.UnixSocket.__init__"></a>
+
+#### \_\_init\_\_
+
+``` python
+ | __init__(ipc_socket, callback=None, quit_callback=None)
+```
+
+Create the wrapper.
+
+**ipc\_socket** is the path to the socket.  
+**callback(json\_data)** is the function for recieving events.
+
+<a name=".python_mpv_jsonipc.UnixSocket.stop"></a>
+
+#### stop
+
+``` python
+ | stop()
+```
+
+Terminate the thread.
+
+<a name=".python_mpv_jsonipc.UnixSocket.send"></a>
+
+#### send
+
+``` python
+ | send(data)
+```
+
+Send **data** to the socket, encoded as JSON.
+
+<a name=".python_mpv_jsonipc.UnixSocket.run"></a>
+
+#### run
+
+``` python
+ | run()
+```
+
+Process socket events. Do not run this directly. Use **start**.
+
+<a name=".python_mpv_jsonipc.MPVProcess"></a>
+
+### MPVProcess
+
+``` python
+class MPVProcess()
+```
+
+Manages an MPV process, ensuring the socket or pipe is available. (Internal)
+
+<a name=".python_mpv_jsonipc.MPVProcess.__init__"></a>
+
+#### \_\_init\_\_
+
+``` python
+ | __init__(ipc_socket, mpv_location=None, ****kwargs)
+```
+
+Create and start the MPV process. Will block until socket/pipe is available.
+
+**ipc\_socket** is the path to the Unix/Linux socket or name of the Windows pipe.  
+**mpv\_location** is the path to mpv. If left unset it tries the one in the PATH.
+
+All other arguments are forwarded to MPV as command-line arguments.
+
+<a name=".python_mpv_jsonipc.MPVProcess.stop"></a>
+
+#### stop
+
+``` python
+ | stop()
+```
+
+Terminate the process.
+
+<a name=".python_mpv_jsonipc.MPVInter"></a>
+
+### MPVInter
+
+``` python
+class MPVInter()
+```
+
+Low-level interface to MPV. Does NOT manage an mpv process. (Internal)
+
+<a name=".python_mpv_jsonipc.MPVInter.__init__"></a>
+
+#### \_\_init\_\_
+
+``` python
+ | __init__(ipc_socket, callback=None, quit_callback=None)
+```
+
+Create the wrapper.
+
+**ipc\_socket** is the path to the Unix/Linux socket or name of the Windows pipe.  
+**callback(event\_name, data)** is the function for recieving events.
+
+<a name=".python_mpv_jsonipc.MPVInter.stop"></a>
+
+#### stop
+
+``` python
+ | stop()
+```
+
+Terminate the underlying connection.
+
+<a name=".python_mpv_jsonipc.MPVInter.event_callback"></a>
+
+#### event\_callback
+
+``` python
+ | event_callback(data)
+```
+
+Internal callback for recieving events from MPV.
+
+<a name=".python_mpv_jsonipc.MPVInter.command"></a>
+
+#### command
+
+``` python
+ | command(command, **args)
+```
+
+Issue a command to MPV. Will block until completed or timeout is reached.
+
+**command** is the name of the MPV command
+
+All further arguments are forwarded to the MPV command.  
+Throws TimeoutError if timeout of 120 seconds is reached.
+
+<a name=".python_mpv_jsonipc.EventHandler"></a>
+
+### EventHandler
+
+``` python
+class EventHandler(threading.Thread)
+```
+
+Event handling thread. (Internal)
+
+<a name=".python_mpv_jsonipc.EventHandler.__init__"></a>
+
+#### \_\_init\_\_
+
+``` python
+ | __init__()
+```
+
+Create an instance of the thread.
+
+<a name=".python_mpv_jsonipc.EventHandler.put_task"></a>
+
+#### put\_task
+
+``` python
+ | put_task(func, **args)
+```
+
+Put a new task to the thread.
+
+**func** is the function to call
+
+All further arguments are forwarded to **func**.
+
+<a name=".python_mpv_jsonipc.EventHandler.stop"></a>
+
+#### stop
+
+``` python
+ | stop()
+```
+
+Terminate the thread.
+
+<a name=".python_mpv_jsonipc.EventHandler.run"></a>
+
+#### run
+
+``` python
+ | run()
+```
+
+Process socket events. Do not run this directly. Use **start**.
+
+<a name=".python_mpv_jsonipc.MPV"></a>
+
+### MPV
+
+``` python
+class MPV()
+```
+
+The main MPV interface class. Use this to control MPV.
+
+This will expose all mpv commands as callable methods and all properties.  
+You can set properties and call the commands directly.
+
+Please note that if you are using a really old MPV version, a fallback command  
+list is used. Not all commands may actually work when this fallback is used.
+
+<a name=".python_mpv_jsonipc.MPV.__init__"></a>
+
+#### \_\_init\_\_
+
+``` python
+ | __init__(start_mpv=True, ipc_socket=None, mpv_location=None, log_handler=None, loglevel=None, quit_callback=None, ****kwargs)
+```
+
+Create the interface to MPV and process instance.
+
+**start\_mpv** will start an MPV process if true. (Default: True)  
+**ipc\_socket** is the path to the Unix/Linux socket or name of Windows pipe. (Default: Random Temp File)  
+**mpv\_location** is the location of MPV for **start\_mpv**. (Default: Use MPV in PATH)  
+**log\_handler(level, prefix, text)** is an optional handler for log events. (Default: Disabled)  
+**loglevel** is the level for log messages. Levels are fatal, error, warn, info, v, debug, trace. (Default: Disabled)
+
+All other arguments are forwarded to MPV as command-line arguments if **start\_mpv** is used.
+
+<a name=".python_mpv_jsonipc.MPV.bind_event"></a>
+
+#### bind\_event
+
+``` python
+ | bind_event(name, callback)
+```
+
+Bind a callback to an MPV event.
+
+**name** is the MPV event name.  
+**callback(event\_data)** is the function to call.
+
+<a name=".python_mpv_jsonipc.MPV.on_event"></a>
+
+#### on\_event
+
+``` python
+ | on_event(name)
+```
+
+Decorator to bind a callback to an MPV event.
+
+@on\_event(name)  
+def my\_callback(event\_data):  
+pass
+
+<a name=".python_mpv_jsonipc.MPV.event_callback"></a>
+
+#### event\_callback
+
+``` python
+ | event_callback(name)
+```
+
+An alias for on\_event to maintain compatibility with python-mpv.
+
+<a name=".python_mpv_jsonipc.MPV.on_key_press"></a>
+
+#### on\_key\_press
+
+``` python
+ | on_key_press(name)
+```
+
+Decorator to bind a callback to an MPV keypress event.
+
+@on\_key\_press(key\_name)  
+def my\_callback():  
+pass
+
+<a name=".python_mpv_jsonipc.MPV.bind_key_press"></a>
+
+#### bind\_key\_press
+
+``` python
+ | bind_key_press(name, callback)
+```
+
+Bind a callback to an MPV keypress event.
+
+**name** is the key symbol.  
+**callback()** is the function to call.
+
+<a name=".python_mpv_jsonipc.MPV.bind_property_observer"></a>
+
+#### bind\_property\_observer
+
+``` python
+ | bind_property_observer(name, callback)
+```
+
+Bind a callback to an MPV property change.
+
+**name** is the property name.  
+**callback(name, data)** is the function to call.
+
+Returns a unique observer ID needed to destroy the observer.
+
+<a name=".python_mpv_jsonipc.MPV.unbind_property_observer"></a>
+
+#### unbind\_property\_observer
+
+``` python
+ | unbind_property_observer(observer_id)
+```
+
+Remove callback to an MPV property change.
+
+**observer\_id** is the id returned by bind\_property\_observer.
+
+<a name=".python_mpv_jsonipc.MPV.property_observer"></a>
+
+#### property\_observer
+
+``` python
+ | property_observer(name)
+```
+
+Decorator to bind a callback to an MPV property change.
+
+@property\_observer(property\_name)  
+def my\_callback(name, data):  
+pass
+
+<a name=".python_mpv_jsonipc.MPV.wait_for_property"></a>
+
+#### wait\_for\_property
+
+``` python
+ | wait_for_property(name)
+```
+
+Waits for the value of a property to change.
+
+**name** is the name of the property.
+
+<a name=".python_mpv_jsonipc.MPV.play"></a>
+
+#### play
+
+``` python
+ | play(url)
+```
+
+Play the specified URL. An alias to loadfile().
+
+<a name=".python_mpv_jsonipc.MPV.terminate"></a>
+
+#### terminate
+
+``` python
+ | terminate()
+```
+
+Terminate the connection to MPV and process (if **start\_mpv** is used).
+
+<a name=".python_mpv_jsonipc.MPV.command"></a>
+
+#### command
+
+``` python
+ | command(command, **args)
+```
+
+Send a command to MPV. All commands are bound to the class by default,  
+except JSON IPC specific commands. This may also be useful to retain  
+compatibility with python-mpv, as it does not bind all of the commands.
+
+**command** is the command name.
+
+All further arguments are forwarded to the MPV command.

syncplay/players/python_mpv_jsonipc/python_mpv_jsonipc.py

@@ -0,0 +1,640 @@
+import threading
+import socket
+import json
+import os
+import time
+import subprocess
+import random
+import queue
+import logging
+
+log = logging.getLogger('mpv-jsonipc')
+
+if os.name == "nt":
+    import _winapi
+    from multiprocessing.connection import PipeConnection
+
+TIMEOUT = 120
+
+# Older MPV versions do not allow us to dynamically retrieve the command list.
+FALLBACK_COMMAND_LIST = [
+    'ignore', 'seek', 'revert-seek', 'quit', 'quit-watch-later', 'stop', 'frame-step', 'frame-back-step',
+    'playlist-next', 'playlist-prev', 'playlist-shuffle', 'playlist-unshuffle', 'sub-step', 'sub-seek',
+    'print-text', 'show-text', 'expand-text', 'expand-path', 'show-progress', 'sub-add', 'audio-add',
+    'video-add', 'sub-remove', 'audio-remove', 'video-remove', 'sub-reload', 'audio-reload', 'video-reload',
+    'rescan-external-files', 'screenshot', 'screenshot-to-file', 'screenshot-raw', 'loadfile', 'loadlist',
+    'playlist-clear', 'playlist-remove', 'playlist-move', 'run', 'subprocess', 'set', 'change-list', 'add',
+    'cycle', 'multiply', 'cycle-values', 'enable-section', 'disable-section', 'define-section', 'ab-loop',
+    'drop-buffers', 'af', 'vf', 'af-command', 'vf-command', 'ao-reload', 'script-binding', 'script-message',
+    'script-message-to', 'overlay-add', 'overlay-remove', 'osd-overlay', 'write-watch-later-config',
+    'hook-add', 'hook-ack', 'mouse', 'keybind', 'keypress', 'keydown', 'keyup', 'apply-profile',
+    'load-script', 'dump-cache', 'ab-loop-dump-cache', 'ab-loop-align-cache']
+
+class MPVError(Exception):
+    """An error originating from MPV or due to a problem with MPV."""
+    def __init__(self, *args, **kwargs):
+        super(MPVError, self).__init__(*args, **kwargs)
+
+class WindowsSocket(threading.Thread):
+    """
+    Wraps a Windows named pipe in a high-level interface. (Internal)
+    
+    Data is automatically encoded and decoded as JSON. The callback
+    function will be called for each inbound message.
+    """
+    def __init__(self, ipc_socket, callback=None, quit_callback=None):
+        """Create the wrapper.
+
+        *ipc_socket* is the pipe name. (Not including \\\\.\\pipe\\)
+        *callback(json_data)* is the function for recieving events.
+        *quit_callback* is called when the socket connection dies.
+        """
+        ipc_socket = "\\\\.\\pipe\\" + ipc_socket
+        self.callback = callback
+        self.quit_callback = quit_callback
+        
+        access = _winapi.GENERIC_READ | _winapi.GENERIC_WRITE
+        limit = 5 # Connection may fail at first. Try 5 times.
+        for _ in range(limit):
+            try:
+                pipe_handle = _winapi.CreateFile(
+                    ipc_socket, access, 0, _winapi.NULL, _winapi.OPEN_EXISTING,
+                    _winapi.FILE_FLAG_OVERLAPPED, _winapi.NULL
+                    )
+                break
+            except OSError:
+                time.sleep(1)
+        else:
+            raise MPVError("Cannot connect to pipe.")
+        self.socket = PipeConnection(pipe_handle)
+
+        if self.callback is None:
+            self.callback = lambda data: None
+
+        threading.Thread.__init__(self)
+
+    def stop(self, join=True):
+        """Terminate the thread."""
+        if self.socket is not None:
+            self.socket.close()
+        if join:
+            self.join()
+
+    def send(self, data):
+        """Send *data* to the pipe, encoded as JSON."""
+        try:
+            self.socket.send_bytes(json.dumps(data).encode('utf-8') + b'\n')
+        except OSError as ex:
+            if len(ex.args) == 1 and ex.args[0] == "handle is closed":
+                raise BrokenPipeError("handle is closed")
+            raise ex
+
+    def run(self):
+        """Process pipe events. Do not run this directly. Use *start*."""
+        data = b''
+        try:
+            while True:
+                current_data = self.socket.recv_bytes(2048)
+                if current_data == b'':
+                    break
+
+                data += current_data
+                if data[-1] != 10:
+                    continue
+
+                data = data.decode('utf-8', 'ignore').encode('utf-8')
+                for item in data.split(b'\n'):
+                    if item == b'':
+                        continue
+                    json_data = json.loads(item)
+                    self.callback(json_data)
+                data = b''
+        except EOFError:
+            if self.quit_callback:
+                self.quit_callback()
+
+class UnixSocket(threading.Thread):
+    """
+    Wraps a Unix/Linux socket in a high-level interface. (Internal)
+    
+    Data is automatically encoded and decoded as JSON. The callback
+    function will be called for each inbound message.
+    """
+    def __init__(self, ipc_socket, callback=None, quit_callback=None):
+        """Create the wrapper.
+
+        *ipc_socket* is the path to the socket.
+        *callback(json_data)* is the function for recieving events.
+        *quit_callback* is called when the socket connection dies.
+        """
+        self.ipc_socket = ipc_socket
+        self.callback = callback
+        self.quit_callback = quit_callback
+        self.socket = socket.socket(socket.AF_UNIX)
+        self.socket.connect(self.ipc_socket)
+
+        if self.callback is None:
+            self.callback = lambda data: None
+
+        threading.Thread.__init__(self)
+
+    def stop(self, join=True):
+        """Terminate the thread."""
+        if self.socket is not None:
+            try:
+                self.socket.shutdown(socket.SHUT_WR)
+                self.socket.close()
+                self.socket = None
+            except OSError:
+                pass # Ignore socket close failure.
+        if join:
+            self.join()
+
+    def send(self, data):
+        """Send *data* to the socket, encoded as JSON."""
+        if self.socket is None:
+            raise BrokenPipeError("socket is closed")
+        self.socket.send(json.dumps(data).encode('utf-8') + b'\n')
+
+    def run(self):
+        """Process socket events. Do not run this directly. Use *start*."""
+        data = b''
+        while True:
+            current_data = self.socket.recv(1024)
+            if current_data == b'':
+                break
+
+            data += current_data
+            if data[-1] != 10:
+                continue
+
+            data = data.decode('utf-8', 'ignore').encode('utf-8')
+            for item in data.split(b'\n'):
+                if item == b'':
+                    continue
+                json_data = json.loads(item)
+                self.callback(json_data)
+            data = b''
+        if self.quit_callback:
+            self.quit_callback()
+
+class MPVProcess:
+    """
+    Manages an MPV process, ensuring the socket or pipe is available. (Internal)
+    """
+    def __init__(self, ipc_socket, mpv_location=None, **kwargs):
+        """
+        Create and start the MPV process. Will block until socket/pipe is available.
+
+        *ipc_socket* is the path to the Unix/Linux socket or name of the Windows pipe.
+        *mpv_location* is the path to mpv. If left unset it tries the one in the PATH.
+
+        All other arguments are forwarded to MPV as command-line arguments.
+        """
+        if mpv_location is None:
+            if os.name == 'nt':
+                mpv_location = "mpv.exe"
+            else:
+                mpv_location = "mpv"
+        
+        log.debug("Staring MPV from {0}.".format(mpv_location))
+        ipc_socket_name = ipc_socket
+        if os.name == 'nt':
+            ipc_socket = "\\\\.\\pipe\\" + ipc_socket
+
+        if os.name != 'nt' and os.path.exists(ipc_socket):
+            os.remove(ipc_socket)
+
+        log.debug("Using IPC socket {0} for MPV.".format(ipc_socket))
+        self.ipc_socket = ipc_socket
+        args = [mpv_location]
+        self._set_default(kwargs, "idle", True)
+        self._set_default(kwargs, "input_ipc_server", ipc_socket_name)
+        self._set_default(kwargs, "input_terminal", False)
+        self._set_default(kwargs, "terminal", False)
+        args.extend("--{0}={1}".format(v[0].replace("_", "-"), self._mpv_fmt(v[1]))
+                    for v in kwargs.items())
+        self.process = subprocess.Popen(args)
+        ipc_exists = False
+        for _ in range(100): # Give MPV 10 seconds to start.
+            time.sleep(0.1)
+            self.process.poll()
+            if os.path.exists(ipc_socket):
+                ipc_exists = True
+                log.debug("Found MPV socket.")
+                break
+            if self.process.returncode is not None:
+                log.error("MPV failed with returncode {0}.".format(self.process.returncode))
+                break
+        else:
+            self.process.terminate()
+            raise MPVError("MPV start timed out.")
+        
+        if not ipc_exists or self.process.returncode is not None:
+            self.process.terminate()
+            raise MPVError("MPV not started.")
+
+    def _set_default(self, prop_dict, key, value):
+        if key not in prop_dict:
+            prop_dict[key] = value
+
+    def _mpv_fmt(self, data):
+        if data == True:
+            return "yes"
+        elif data == False:
+            return "no"
+        else:
+            return data
+
+    def stop(self):
+        """Terminate the process."""
+        self.process.terminate()
+        if os.name != 'nt' and os.path.exists(self.ipc_socket):
+            os.remove(self.ipc_socket)
+
+class MPVInter:
+    """
+    Low-level interface to MPV. Does NOT manage an mpv process. (Internal)
+    """
+    def __init__(self, ipc_socket, callback=None, quit_callback=None):
+        """Create the wrapper.
+
+        *ipc_socket* is the path to the Unix/Linux socket or name of the Windows pipe.
+        *callback(event_name, data)* is the function for recieving events.
+        *quit_callback* is called when the socket connection to MPV dies.
+        """
+        Socket = UnixSocket
+        if os.name == 'nt':
+            Socket = WindowsSocket
+
+        self.callback = callback
+        self.quit_callback = quit_callback
+        if self.callback is None:
+            self.callback = lambda event, data: None
+        
+        self.socket = Socket(ipc_socket, self.event_callback, self.quit_callback)
+        self.socket.start()
+        self.command_id = 1
+        self.rid_lock = threading.Lock()
+        self.socket_lock = threading.Lock()
+        self.cid_result = {}
+        self.cid_wait = {}
+    
+    def stop(self, join=True):
+        """Terminate the underlying connection."""
+        self.socket.stop(join)
+
+    def event_callback(self, data):
+        """Internal callback for recieving events from MPV."""
+        if "request_id" in data:
+            self.cid_result[data["request_id"]] = data
+            self.cid_wait[data["request_id"]].set()
+        elif "event" in data:
+            self.callback(data["event"], data)
+    
+    def command(self, command, *args):
+        """
+        Issue a command to MPV. Will block until completed or timeout is reached.
+        
+        *command* is the name of the MPV command
+
+        All further arguments are forwarded to the MPV command.
+        Throws TimeoutError if timeout of 120 seconds is reached.
+        """
+        self.rid_lock.acquire()
+        command_id = self.command_id
+        self.command_id += 1
+        self.rid_lock.release()
+
+        event = threading.Event()
+        self.cid_wait[command_id] = event
+
+        command_list = [command]
+        command_list.extend(args)
+        try:
+            self.socket_lock.acquire()
+            self.socket.send({"command":command_list, "request_id": command_id})
+        finally:
+            self.socket_lock.release()
+
+        has_event = event.wait(timeout=TIMEOUT)
+        if has_event:
+            data = self.cid_result[command_id]
+            del self.cid_result[command_id]
+            del self.cid_wait[command_id]
+            if data["error"] != "success":
+                if data["error"] == "property unavailable":
+                    return None
+                raise MPVError(data["error"])
+            else:
+                return data.get("data")
+        else:
+            raise TimeoutError("No response from MPV.")
+
+class EventHandler(threading.Thread):
+    """Event handling thread. (Internal)"""
+    def __init__(self):
+        """Create an instance of the thread."""
+        self.queue = queue.Queue()
+        threading.Thread.__init__(self)
+    
+    def put_task(self, func, *args):
+        """
+        Put a new task to the thread.
+        
+        *func* is the function to call
+        
+        All further arguments are forwarded to *func*.
+        """
+        self.queue.put((func, args))
+
+    def stop(self, join=True):
+        """Terminate the thread."""
+        self.queue.put("quit")
+        self.join(join)
+
+    def run(self):
+        """Process socket events. Do not run this directly. Use *start*."""
+        while True:
+            event = self.queue.get()
+            if event == "quit":
+                break
+            try:
+                event[0](*event[1])
+            except Exception:
+                log.error("EventHandler caught exception from {0}.".format(event), exc_info=1)
+
+class MPV:
+    """
+    The main MPV interface class. Use this to control MPV.
+    
+    This will expose all mpv commands as callable methods and all properties.
+    You can set properties and call the commands directly.
+    
+    Please note that if you are using a really old MPV version, a fallback command
+    list is used. Not all commands may actually work when this fallback is used.
+    """
+    def __init__(self, start_mpv=True, ipc_socket=None, mpv_location=None,
+                 log_handler=None, loglevel=None, quit_callback=None, **kwargs):
+        """
+        Create the interface to MPV and process instance.
+
+        *start_mpv* will start an MPV process if true. (Default: True)
+        *ipc_socket* is the path to the Unix/Linux socket or name of Windows pipe. (Default: Random Temp File)
+        *mpv_location* is the location of MPV for *start_mpv*. (Default: Use MPV in PATH)
+        *log_handler(level, prefix, text)* is an optional handler for log events. (Default: Disabled)
+        *loglevel* is the level for log messages. Levels are fatal, error, warn, info, v, debug, trace. (Default: Disabled)
+        *quit_callback* is called when the socket connection to MPV dies.
+
+        All other arguments are forwarded to MPV as command-line arguments if *start_mpv* is used.
+        """
+        self.properties = {}
+        self.event_bindings = {}
+        self.key_bindings = {}
+        self.property_bindings = {}
+        self.mpv_process = None
+        self.mpv_inter = None
+        self.quit_callback = quit_callback
+        self.event_handler = EventHandler()
+        self.event_handler.start()
+        if ipc_socket is None:
+            rand_file = "mpv{0}".format(random.randint(0, 2**48))
+            if os.name == "nt":
+                ipc_socket = rand_file
+            else:
+                ipc_socket = "/tmp/{0}".format(rand_file)
+
+        if start_mpv:
+            # Attempt to start MPV 3 times.
+            for i in range(3):
+                try:
+                    self.mpv_process = MPVProcess(ipc_socket, mpv_location, **kwargs)
+                    break
+                except MPVError:
+                    log.warning("MPV start failed.", exc_info=1)
+                    continue
+            else:
+                raise MPVError("MPV process retry limit reached.")
+
+        self.mpv_inter = MPVInter(ipc_socket, self._callback, self._quit_callback)
+        self.properties = set(x.replace("-", "_") for x in self.command("get_property", "property-list"))
+        try:
+            command_list = [x["name"] for x in self.command("get_property", "command-list")]
+        except MPVError:
+            log.warning("Using fallback command list.")
+            command_list = FALLBACK_COMMAND_LIST
+        for command in command_list:
+            object.__setattr__(self, command.replace("-", "_"), self._get_wrapper(command))
+
+        self._dir = list(self.properties)
+        self._dir.extend(object.__dir__(self))
+
+        self.observer_id = 1
+        self.observer_lock = threading.Lock()
+        self.keybind_id = 1
+        self.keybind_lock = threading.Lock()
+        
+        if log_handler is not None and loglevel is not None:
+            self.command("request_log_messages", loglevel)
+            @self.on_event("log-message")
+            def log_handler_event(data):
+                self.event_handler.put_task(log_handler, data["level"], data["prefix"], data["text"].strip())
+
+        @self.on_event("property-change")
+        def event_handler(data):
+            if data.get("id") in self.property_bindings:
+                self.event_handler.put_task(self.property_bindings[data["id"]], data["name"], data.get("data"))
+
+        @self.on_event("client-message")
+        def client_message_handler(data):
+            args = data["args"]
+            if len(args) == 2 and args[0] == "custom-bind":
+                self.event_handler.put_task(self.key_bindings[args[1]])
+
+    def _quit_callback(self):
+        """
+        Internal handler for quit events.
+        """
+        if self.quit_callback:
+            self.quit_callback()
+        self.terminate(join=False)
+
+    def bind_event(self, name, callback):
+        """
+        Bind a callback to an MPV event.
+
+        *name* is the MPV event name.
+        *callback(event_data)* is the function to call.
+        """
+        if name not in self.event_bindings:
+            self.event_bindings[name] = set()
+        self.event_bindings[name].add(callback)
+
+    def on_event(self, name):
+        """
+        Decorator to bind a callback to an MPV event.
+
+        @on_event(name)
+        def my_callback(event_data):
+            pass
+        """
+        def wrapper(func):
+            self.bind_event(name, func)
+            return func
+        return wrapper
+
+    # Added for compatibility.
+    def event_callback(self, name):
+        """An alias for on_event to maintain compatibility with python-mpv."""
+        return self.on_event(name)
+
+    def on_key_press(self, name):
+        """
+        Decorator to bind a callback to an MPV keypress event.
+
+        @on_key_press(key_name)
+        def my_callback():
+            pass
+        """
+        def wrapper(func):
+            self.bind_key_press(name, func)
+            return func
+        return wrapper
+
+    def bind_key_press(self, name, callback):
+        """
+        Bind a callback to an MPV keypress event.
+
+        *name* is the key symbol.
+        *callback()* is the function to call.
+        """
+        self.keybind_lock.acquire()
+        keybind_id = self.keybind_id
+        self.keybind_id += 1
+        self.keybind_lock.release()
+
+        bind_name = "bind{0}".format(keybind_id)
+        self.key_bindings["bind{0}".format(keybind_id)] = callback
+        try:
+            self.keybind(name, "script-message custom-bind {0}".format(bind_name))
+        except MPVError:
+            self.define_section(bind_name, "{0} script-message custom-bind {1}".format(name, bind_name))
+            self.enable_section(bind_name)
+
+    def bind_property_observer(self, name, callback):
+        """
+        Bind a callback to an MPV property change.
+
+        *name* is the property name.
+        *callback(name, data)* is the function to call.
+
+        Returns a unique observer ID needed to destroy the observer.
+        """
+        self.observer_lock.acquire()
+        observer_id = self.observer_id
+        self.observer_id += 1
+        self.observer_lock.release()
+
+        self.property_bindings[observer_id] = callback
+        self.command("observe_property", observer_id, name)
+        return observer_id
+
+    def unbind_property_observer(self, observer_id):
+        """
+        Remove callback to an MPV property change.
+
+        *observer_id* is the id returned by bind_property_observer.
+        """
+        self.command("unobserve_property", observer_id)
+        del self.property_bindings[observer_id]
+
+    def property_observer(self, name):
+        """
+        Decorator to bind a callback to an MPV property change.
+
+        @property_observer(property_name)
+        def my_callback(name, data):
+            pass
+        """
+        def wrapper(func):
+            self.bind_property_observer(name, func)
+            return func
+        return wrapper
+    
+    def wait_for_property(self, name):
+        """
+        Waits for the value of a property to change.
+
+        *name* is the name of the property.
+        """
+        event = threading.Event()
+        first_event = True
+        def handler(*_):
+            nonlocal first_event
+            if first_event == True:
+                first_event = False
+            else:
+                event.set()
+        observer_id = self.bind_property_observer(name, handler)
+        event.wait()
+        self.unbind_property_observer(observer_id)
+
+    def _get_wrapper(self, name):
+        def wrapper(*args):
+            return self.command(name, *args)
+        return wrapper
+
+    def _callback(self, event, data):
+        if event in self.event_bindings:
+            for callback in self.event_bindings[event]:
+                self.event_handler.put_task(callback, data)
+
+    def play(self, url):
+        """Play the specified URL. An alias to loadfile()."""
+        self.loadfile(url)
+
+    def __del__(self):
+        self.terminate()
+
+    def terminate(self, join=True):
+        """Terminate the connection to MPV and process (if *start_mpv* is used)."""
+        if self.mpv_process:
+            self.mpv_process.stop()
+        if self.mpv_inter:
+            self.mpv_inter.stop(join)
+        self.event_handler.stop(join)
+
+    def command(self, command, *args):
+        """
+        Send a command to MPV. All commands are bound to the class by default,
+        except JSON IPC specific commands. This may also be useful to retain
+        compatibility with python-mpv, as it does not bind all of the commands. 
+
+        *command* is the command name.
+
+        All further arguments are forwarded to the MPV command. 
+        """
+        return self.mpv_inter.command(command, *args)
+
+    def __getattr__(self, name):
+        if name in self.properties:
+            return self.command("get_property", name.replace("_", "-"))
+        return object.__getattribute__(self, name)
+
+    def __setattr__(self, name, value):
+        if name not in {"properties", "command"} and name in self.properties:
+            return self.command("set_property", name.replace("_", "-"), value)
+        return object.__setattr__(self, name, value)
+
+    def __hasattr__(self, name):
+        if object.__hasattr__(self, name):
+            return True
+        else:
+            try:
+                getattr(self, name)
+                return True
+            except MPVError:
+                return False
+
+    def __dir__(self):
+        return self._dir

syncplay/players/python_mpv_jsonipc/setup.py

@@ -0,0 +1,25 @@
+from setuptools import setup
+import os
+
+with open("README.md", "r") as fh:
+    long_description = fh.read()
+
+setup(
+    name='python-mpv-jsonipc',
+    version='1.1.11',
+    author="Ian Walton",
+    author_email="iwalton3@gmail.com",
+    description="Python API to MPV using JSON IPC",
+    license='Apache-2.0',
+    long_description=open('README.md').read(),
+    long_description_content_type="text/markdown",
+    url="https://github.com/iwalton3/python-mpv-jsonipc",
+    py_modules=['python_mpv_jsonipc'],
+    classifiers=[
+        "Programming Language :: Python :: 3",
+        "License :: OSI Approved :: Apache Software License",
+        "Operating System :: OS Independent",
+    ],
+    python_requires='>=3.6',
+    install_requires=[]
+)

syncplay/players/vlc.py

@@ -407,7 +407,6 @@ class VlcPlayer(BasePlayer):
                 playerController.vlcDataPath = "/usr/lib/syncplay/resources"
             else:
                 playerController.vlcDataPath = utils.findWorkingDir() + "\\resources"
-            playerController.SLAVE_ARGS.append('--data-path={}'.format(playerController.vlcDataPath))
             playerController.SLAVE_ARGS.append(
                 '--lua-config=syncplay={{modulepath=\"{}\",port=\"{}\"}}'.format(
                     playerController.vlcModulePath, str(playerController.vlcport)))

syncplay/resources/syncplayintf.lua

@@ -133,6 +133,7 @@ function add_chat(chat_message, mood)
 	chat_log[entry] = { xpos=CANVAS_WIDTH, timecreated=mp.get_time(), text=tostring(chat_message), row=row }
 end
 
+local old_ass_text = ''
 function chat_update()
     local ass = assdraw.ass_new()
 	local chat_ass = ''
@@ -179,7 +180,14 @@ function chat_update()
         ass:append(input_ass())
         ass:append(chat_ass)
     end
-	mp.set_osd_ass(CANVAS_WIDTH,CANVAS_HEIGHT, ass.text)
+
+    -- The commit that introduced the new API removed the internal heuristics on whether a refresh is required,
+    -- so we check for changed text manually to not cause excessive GPU load
+    -- https://github.com/mpv-player/mpv/commit/07287262513c0d1ea46b7beaf100e73f2008295f#diff-d88d582039dea993b6229da9f61ba76cL530
+    if ass.text ~= old_ass_text then
+		mp.set_osd_ass(CANVAS_WIDTH,CANVAS_HEIGHT, ass.text)
+		old_ass_text = ass.text
+	end
 end
 
 function process_alert_osd()
@@ -333,6 +341,18 @@ mp.register_script_message('set_syncplayintf_options', function(e)
 	set_syncplayintf_options(e)
 end)
 
+function state_paused_and_position()
+	-- bob
+	local pause_status = tostring(mp.get_property_native("pause"))
+	local position_status = tostring(mp.get_property_native("time-pos"))
+	mp.command('print-text "<paused='..pause_status..', pos='..position_status..'>"')
+	-- mp.command('print-text "<paused>true</paused><position>7.6</position>"')
+end
+
+mp.register_script_message('get_paused_and_position', function()
+	state_paused_and_position()
+end)
+
 -- Default options
 local utils = require 'mp.utils'
 local options = require 'mp.options'
@@ -982,4 +1002,4 @@ function set_syncplayintf_options(input)
 	end
 	chat_format = get_output_style()
 	readyMpvAfterSettingsKnown()
-end
+end

syncplay/resources/third-party-notices.rtf

@@ -1,489 +1,463 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1561\cocoasubrtf600
+{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deftab529{\fonttbl{\f0\fswiss\fcharset0 Helvetica;}{\f1\fswiss\fcharset238 Helvetica;}}
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl ;\red0\green0\blue255;}
-{\colortbl;\red255\green255\blue255;}
+{\*\generator Riched20 10.0.18362}\viewkind4\uc1 
-{\*\expandedcolortbl;;}
+\pard\tx529\f0\fs24\lang9 Syncplay relies on the following softwares, in compliance with their licenses. \par
-\vieww13920\viewh8980\viewkind0
+\par
-\deftab529
+\b Qt.py\b0\par
-\pard\tx529\pardeftab529\pardirnatural\partightenfactor0
+\par
-
+Copyright (c) 2016 Marcus Ottosson\par
-\f0\fs24 \cf0 \CocoaLigature0 Syncplay relies on the following softwares, in compliance with their licenses. \
+\par
-\
+Permission is hereby granted, free of charge, to any person obtaining a copy\par
-
+of this software and associated documentation files (the "Software"), to deal\par
-\b Qt.py
+in the Software without restriction, including without limitation the rights\par
-\b0 \
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\par
-\
+copies of the Software, and to permit persons to whom the Software is\par
-Copyright (c) 2016 Marcus Ottosson\
+furnished to do so, subject to the following conditions:\par
-\
+\par
-Permission is hereby granted, free of charge, to any person obtaining a copy\
+The above copyright notice and this permission notice shall be included in all\par
-of this software and associated documentation files (the "Software"), to deal\
+copies or substantial portions of the Software.\par
-in the Software without restriction, including without limitation the rights\
+\par
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\
+\b Qt for Python\par
-copies of the Software, and to permit persons to whom the Software is\
+\b0\par
-furnished to do so, subject to the following conditions:\
+Copyright (C) 2018 The Qt Company Ltd.\par
-\
+Contact: {{\field{\*\fldinst{HYPERLINK https://www.qt.io/licensing/ }}{\fldrslt{https://www.qt.io/licensing/\ul0\cf0}}}}\f0\fs24\par
-The above copyright notice and this permission notice shall be included in all\
+\par
-copies or substantial portions of the Software.\
+This program is free software: you can redistribute it and/or modify\par
-\
+it under the terms of the GNU Lesser General Public License as published\par
-
+by the Free Software Foundation, either version 3 of the License, or\par
-\b Qt for Python\
+(at your option) any later version.\par
-
+\par
-\b0 \
+This program is distributed in the hope that it will be useful,\par
-Copyright (C) 2018 The Qt Company Ltd.\
+but WITHOUT ANY WARRANTY; without even the implied warranty of\par
-Contact: https://www.qt.io/licensing/\
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\par
-\
+GNU Lesser General Public License for more details.\par
-This program is free software: you can redistribute it and/or modify\
+\par
-it under the terms of the GNU Lesser General Public License as published\
+You should have received a copy of the GNU Lesser General Public License\par
-by the Free Software Foundation, either version 3 of the License, or\
+along with this program.  If not, see <{{\field{\*\fldinst{HYPERLINK "http://www.gnu.org/licenses/"}}{\fldrslt{http://www.gnu.org/licenses/\ul0\cf0}}}}\f0\fs24 >.\par
-(at your option) any later version.\
+\par
-\
+\b Qt\b0\par
-This program is distributed in the hope that it will be useful,\
+\par
-but WITHOUT ANY WARRANTY; without even the implied warranty of\
+This program uses Qt under the GNU LGPL version 3.\par
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\
+\par
-GNU Lesser General Public License for more details.\
+Qt is a C++ toolkit for cross-platform application development.\par
-\
+\par
-You should have received a copy of the GNU Lesser General Public License\
+Qt provides single-source portability across all major desktop operating systems. It is also available for embedded Linux and other embedded and mobile operating systems.\par
-along with this program.  If not, see <http://www.gnu.org/licenses/>.\
+\par
-\
+Qt is available under three different licensing options designed to accommodate the needs of our various users.\par
-
+\par
-\b Qt
+Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 3 or GNU LGPL version 2.1.\par
-\b0 \
+\par
-\
+Qt licensed under the GNU LGPL version 3 is appropriate for the development of Qt applications provided you can comply with the terms and conditions of the GNU LGPL version 3.\par
-This program uses Qt under the GNU LGPL version 3.\
+\par
-\
+Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications provided you can comply with the terms and conditions of the GNU LGPL version 2.1.\par
-Qt is a C++ toolkit for cross-platform application development.\
+\par
-\
+Please see qt.io/licensing for an overview of Qt licensing.\par
-Qt provides single-source portability across all major desktop operating systems. It is also available for embedded Linux and other embedded and mobile operating systems.\
+\par
-\
+Copyright (C) 2017 The Qt Company Ltd and other contributors.\par
-Qt is available under three different licensing options designed to accommodate the needs of our various users.\
+\par
-\
+Qt and the Qt logo are trademarks of The Qt Company Ltd.\par
-Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 3 or GNU LGPL version 2.1.\
+\par
-\
+Qt is The Qt Company Ltd product developed as an open source project. See qt.io for more information.\par
-Qt licensed under the GNU LGPL version 3 is appropriate for the development of Qt applications provided you can comply with the terms and conditions of the GNU LGPL version 3.\
+\par
-\
+\b Twisted\par
-Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications provided you can comply with the terms and conditions of the GNU LGPL version 2.1.\
+\par
-\
+\b0 Copyright (c) 2001-2017\par
-Please see qt.io/licensing for an overview of Qt licensing.\
+Allen Short\par
-\
+Amber Hawkie Brown\par
-Copyright (C) 2017 The Qt Company Ltd and other contributors.\
+Andrew Bennetts\par
-\
+Andy Gayton\par
-Qt and the Qt logo are trademarks of The Qt Company Ltd.\
+Antoine Pitrou\par
-\
+Apple Computer, Inc.\par
-Qt is The Qt Company Ltd product developed as an open source project. See qt.io for more information.\
+Ashwini Oruganti\par
-\
+Benjamin Bruheim\par
-
+Bob Ippolito\par
-\b Twisted\
+Canonical Limited\par
-\
+Christopher Armstrong\par
-
+David Reid\par
-\b0 Copyright (c) 2001-2017\
+Divmod Inc.\par
-Allen Short\
+Donovan Preston\par
-Amber Hawkie Brown\
+Eric Mangold\par
-Andrew Bennetts\
+Eyal Lotem\par
-Andy Gayton\
+Google Inc.\par
-Antoine Pitrou\
+Hybrid Logic Ltd.\par
-Apple Computer, Inc.\
+Hynek Schlawack\par
-Ashwini Oruganti\
+Itamar Turner-Trauring\par
-Benjamin Bruheim\
+James Knight\par
-Bob Ippolito\
+Jason A. Mobarak\par
-Canonical Limited\
+Jean-Paul Calderone\par
-Christopher Armstrong\
+Jessica McKellar\par
-David Reid\
+Jonathan D. Simms\par
-Divmod Inc.\
+Jonathan Jacobs\par
-Donovan Preston\
+Jonathan Lange\par
-Eric Mangold\
+Julian Berman\par
-Eyal Lotem\
+J\'fcrgen Hermann\par
-Google Inc.\
+Kevin Horn\par
-Hybrid Logic Ltd.\
+Kevin Turner\par
-Hynek Schlawack\
+Laurens Van Houtven\par
-Itamar Turner-Trauring\
+Mary Gardiner\par
-James Knight\
+Massachusetts Institute of Technology\par
-Jason A. Mobarak\
+Matthew Lefkowitz\par
-Jean-Paul Calderone\
+Moshe Zadka\par
-Jessica McKellar\
+Paul Swartz\par
-Jonathan D. Simms\
+Pavel Pergamenshchik\par
-Jonathan Jacobs\
+Rackspace, US Inc.\par
-Jonathan Lange\
+Ralph Meijer\par
-Julian Berman\
+Richard Wall\par
-J\'fcrgen Hermann\
+Sean Riley\par
-Kevin Horn\
+Software Freedom Conservancy\par
-Kevin Turner\
+Tavendo GmbH\par
-Laurens Van Houtven\
+Thijs Triemstra\par
-Mary Gardiner\
+Thomas Herve\par
-Massachusetts Institute of Technology\
+Timothy Allen\par
-Matthew Lefkowitz\
+Tom Prince\par
-Moshe Zadka\
+Travis B. Hartwell\par
-Paul Swartz\
+\par
-Pavel Pergamenshchik\
+and others that have contributed code to the public domain.\par
-Rackspace, US Inc.\
+\par
-Ralph Meijer\
+Permission is hereby granted, free of charge, to any person obtaining\par
-Richard Wall\
+a copy of this software and associated documentation files (the\par
-Sean Riley\
+"Software"), to deal in the Software without restriction, including\par
-Software Freedom Conservancy\
+without limitation the rights to use, copy, modify, merge, publish,\par
-Tavendo GmbH\
+distribute, sublicense, and/or sell copies of the Software, and to\par
-Thijs Triemstra\
+permit persons to whom the Software is furnished to do so, subject to\par
-Thomas Herve\
+the following conditions:\par
-Timothy Allen\
+\par
-Tom Prince\
+The above copyright notice and this permission notice shall be\par
-Travis B. Hartwell\
+included in all copies or substantial portions of the Software.\par
-\
+\b\par
-and others that have contributed code to the public domain.\
+qt5reactor\par
-\
+\par
-Permission is hereby granted, free of charge, to any person obtaining\
+\b0 Copyright (c) 2001-2018\par
-a copy of this software and associated documentation files (the\
+Allen Short\par
-"Software"), to deal in the Software without restriction, including\
+Andy Gayton\par
-without limitation the rights to use, copy, modify, merge, publish,\
+Andrew Bennetts\par
-distribute, sublicense, and/or sell copies of the Software, and to\
+Antoine Pitrou\par
-permit persons to whom the Software is furnished to do so, subject to\
+Apple Computer, Inc.\par
-the following conditions:\
+Ashwini Oruganti\par
-\
+bakbuk\par
-The above copyright notice and this permission notice shall be\
+Benjamin Bruheim\par
-included in all copies or substantial portions of the Software.\
+Bob Ippolito\par
-
+Burak Nehbit\par
-\b \
+Canonical Limited\par
-qt5reactor\
+Christopher Armstrong\par
-\
+Christopher R. Wood\par
-
+David Reid\par
-\b0 Copyright (c) 2001-2018\
+Donovan Preston\par
-Allen Short\
+Elvis Stansvik\par
-Andy Gayton\
+Eric Mangold\par
-Andrew Bennetts\
+Eyal Lotem\par
-Antoine Pitrou\
+Glenn Tarbox\par
-Apple Computer, Inc.\
+Google Inc.\par
-Ashwini Oruganti\
+Hybrid Logic Ltd.\par
-bakbuk\
+Hynek Schlawack\par
-Benjamin Bruheim\
+Itamar Turner-Trauring\par
-Bob Ippolito\
+James Knight\par
-Burak Nehbit\
+Jason A. Mobarak\par
-Canonical Limited\
+Jean-Paul Calderone\par
-Christopher Armstrong\
+Jessica McKellar\par
-Christopher R. Wood\
+Jonathan Jacobs\par
-David Reid\
+Jonathan Lange\par
-Donovan Preston\
+Jonathan D. Simms\par
-Elvis Stansvik\
+J\'fcrgen Hermann\par
-Eric Mangold\
+Julian Berman\par
-Eyal Lotem\
+Kevin Horn\par
-Glenn Tarbox\
+Kevin Turner\par
-Google Inc.\
+Kyle Altendorf\par
-Hybrid Logic Ltd.\
+Laurens Van Houtven\par
-Hynek Schlawack\
+Mary Gardiner\par
-Itamar Turner-Trauring\
+Matthew Lefkowitz\par
-James Knight\
+Massachusetts Institute of Technology\par
-Jason A. Mobarak\
+Moshe Zadka\par
-Jean-Paul Calderone\
+Paul Swartz\par
-Jessica McKellar\
+Pavel Pergamenshchik\par
-Jonathan Jacobs\
+Ralph Meijer\par
-Jonathan Lange\
+Richard Wall\par
-Jonathan D. Simms\
+Sean Riley\par
-J\'fcrgen Hermann\
+Software Freedom Conservancy\par
-Julian Berman\
+Tarashish Mishra\par
-Kevin Horn\
+Travis B. Hartwell\par
-Kevin Turner\
+Thijs Triemstra\par
-Kyle Altendorf\
+Thomas Herve\par
-Laurens Van Houtven\
+Timothy Allen\par
-Mary Gardiner\
+Tom Prince\par
-Matthew Lefkowitz\
+\par
-Massachusetts Institute of Technology\
+Permission is hereby granted, free of charge, to any person obtaining\par
-Moshe Zadka\
+a copy of this software and associated documentation files (the\par
-Paul Swartz\
+"Software"), to deal in the Software without restriction, including\par
-Pavel Pergamenshchik\
+without limitation the rights to use, copy, modify, merge, publish,\par
-Ralph Meijer\
+distribute, sublicense, and/or sell copies of the Software, and to\par
-Richard Wall\
+permit persons to whom the Software is furnished to do so, subject to\par
-Sean Riley\
+the following conditions:\par
-Software Freedom Conservancy\
+\par
-Tarashish Mishra\
+The above copyright notice and this permission notice shall be\par
-Travis B. Hartwell\
+included in all copies or substantial portions of the Software.\par
-Thijs Triemstra\
+\par
-Thomas Herve\
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,\par
-Timothy Allen\
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\par
-Tom Prince\
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\par
-\
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE\par
-Permission is hereby granted, free of charge, to any person obtaining\
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION\par
-a copy of this software and associated documentation files (the\
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION\par
-"Software"), to deal in the Software without restriction, including\
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\b\par
-without limitation the rights to use, copy, modify, merge, publish,\
+\par
-distribute, sublicense, and/or sell copies of the Software, and to\
+appnope\par
-permit persons to whom the Software is furnished to do so, subject to\
+\b0\par
-the following conditions:\
+Copyright (c) 2013, Min Ragan-Kelley\par
-\
+\par
-The above copyright notice and this permission notice shall be\
+All rights reserved.\par
-included in all copies or substantial portions of the Software.\
+\par
-\
+Redistribution and use in source and binary forms, with or without\par
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,\
+modification, are permitted provided that the following conditions are met:\par
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\
+\par
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\
+Redistributions of source code must retain the above copyright notice, this\par
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE\
+list of conditions and the following disclaimer.\par
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION\
+\par
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION\
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND\par
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\par
-\b \
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\par
-\
+DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE\par
-appnope\
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\par
-
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\par
-\b0 \
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\par
-Copyright (c) 2013, Min Ragan-Kelley\
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,\par
-\
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\par
-All rights reserved.\
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\par
-\
+\par
-Redistribution and use in source and binary forms, with or without\
+\b py2exe\par
-modification, are permitted provided that the following conditions are met:\
+\b0\par
-\
+Copyright (c) 2000-2013 Thomas Heller, Jimmy Retzlaff\par
-Redistributions of source code must retain the above copyright notice, this\
+\par
-list of conditions and the following disclaimer.\
+Permission is hereby granted, free of charge, to any person obtaining\par
-\
+a copy of this software and associated documentation files (the\par
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND\
+"Software"), to deal in the Software without restriction, including\par
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\
+without limitation the rights to use, copy, modify, merge, publish,\par
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\
+distribute, sublicense, and/or sell copies of the Software, and to\par
-DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE\
+permit persons to whom the Software is furnished to do so, subject to\par
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\
+the following conditions:\par
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\
+\par
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\
+The above copyright notice and this permission notice shall be\par
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,\
+included in all copies or substantial portions of the Software.\par
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\
+\par
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\
+\b py2app\par
-\
+\par
-
+\b0 Copyright (c) 2004 Bob Ippolito.\par
-\b py2exe\
+\par
-
+Some parts copyright (c) 2010-2014 Ronald Oussoren\par
-\b0 \
+\par
-Copyright (c) 2000-2013 Thomas Heller, Jimmy Retzlaff\
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\par
-\
+\par
-Permission is hereby granted, free of charge, to any person obtaining\
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\par
-a copy of this software and associated documentation files (the\
+\par
-"Software"), to deal in the Software without restriction, including\
+\b dmgbuild\par
-without limitation the rights to use, copy, modify, merge, publish,\
+\par
-distribute, sublicense, and/or sell copies of the Software, and to\
+\b0 Copyright (c) 2014 Alastair Houghton\par
-permit persons to whom the Software is furnished to do so, subject to\
+Copyright (c) 2017 The Qt Company Ltd.\par
-the following conditions:\
+\par
-\
+Permission is hereby granted, free of charge, to any person obtaining a copy\par
-The above copyright notice and this permission notice shall be\
+of this software and associated documentation files (the "Software"), to deal\par
-included in all copies or substantial portions of the Software.\
+in the Software without restriction, including without limitation the rights\par
-\
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\par
-
+copies of the Software, and to permit persons to whom the Software is\par
-\b py2app\
+furnished to do so, subject to the following conditions:\par
-\
+\par
-
+The above copyright notice and this permission notice shall be included in\par
-\b0 Copyright (c) 2004 Bob Ippolito.\
+all copies or substantial portions of the Software.\par
-\
+\par
-Some parts copyright (c) 2010-2014 Ronald Oussoren\
+\b Requests\par
-\
+\par
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\
+\b0 Copyright 2018 Kenneth Reitz\par
-\
+\par
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\
+Licensed under the Apache License, Version 2.0 (the \ldblquote License\rdblquote ); you may not use this file\par
-\
+except in compliance with the License. You may obtain a copy of the License at\par
-
+\par
-\b dmgbuild\
+{{\field{\*\fldinst{HYPERLINK http://www.apache.org/licenses/LICENSE-2.0 }}{\fldrslt{http://www.apache.org/licenses/LICENSE-2.0\ul0\cf0}}}}\f0\fs24\par
-\
+\par
-
+Unless required by applicable law or agreed to in writing, software distributed under the \par
-\b0 Copyright (c) 2014 Alastair Houghton\
+License is distributed on an \ldblquote AS IS\rdblquote  BASIS, WITHOUT WARRANTIES OR CONDI-\par
-Copyright (c) 2017 The Qt Company Ltd.\
+TIONS OF ANY KIND, either express or implied. See the License for the specific lang-\par
-\
+uage governing permissions and limitations under the License.\par
-Permission is hereby granted, free of charge, to any person obtaining a copy\
+\par
-of this software and associated documentation files (the "Software"), to deal\
+\b mpv-repl\b0\par
-in the Software without restriction, including without limitation the rights\
+\par
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\
+Copyright 2016, James Ross-Gowan\par
-copies of the Software, and to permit persons to whom the Software is\
+\par
-furnished to do so, subject to the following conditions:\
+Permission to use, copy, modify, and/or distribute this software for any\par
-\
+purpose with or without fee is hereby granted, provided that the above\par
-The above copyright notice and this permission notice shall be included in\
+copyright notice and this permission notice appear in all copies.\par
-all copies or substantial portions of the Software.\
+\par
-\
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH\par
-
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND\par
-\b Requests\
+FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,\par
-\
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM\par
-
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR\par
-\b0 Copyright 2018 Kenneth Reitz\
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR\par
-\
+PERFORMANCE OF THIS SOFTWARE.\par
-Licensed under the Apache License, Version 2.0 (the \'93License\'94); you may not use this file\
+\par
-except in compliance with the License. You may obtain a copy of the License at\
+\b python-certifi\b0\par
-\
+\par
-http://www.apache.org/licenses/LICENSE-2.0\
+This Source Code Form is subject to the terms of the Mozilla Public License,\par
-\
+v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain\par
-Unless required by applicable law or agreed to in writing, software distributed under the \
+one at {{\field{\*\fldinst{HYPERLINK http://mozilla.org/MPL/2.0/ }}{\fldrslt{http://mozilla.org/MPL/2.0/\ul0\cf0}}}}\f0\fs24 .\par
-License is distributed on an \'93AS IS\'94 BASIS, WITHOUT WARRANTIES OR CONDI-\
+\par
-TIONS OF ANY KIND, either express or implied. See the License for the specific lang-\
+\b cffi\b0\par
-uage governing permissions and limitations under the License.\
+\par
-\
+
-
+\pard This package has been mostly done by Armin Rigo with help from\par
-\b mpv-repl
+Maciej Fija\f1\'b3kowski. The idea is heavily based (although not directly\par
-\b0 \
+copied) from LuaJIT ffi by Mike Pall.\par
-\
+\par
-Copyright 2016, James Ross-Gowan\
+Other contributors:\par
-\
+\par
-Permission to use, copy, modify, and/or distribute this software for any\
+  Google Inc.\par
-purpose with or without fee is hereby granted, provided that the above\
+
-copyright notice and this permission notice appear in all copies.\
+\pard\tx529\par
-\
+The MIT License\par
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH\
+\par
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND\
+Permission is hereby granted, free of charge, to any person \par
-FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,\
+obtaining a copy of this software and associated documentation \par
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM\
+files (the "Software"), to deal in the Software without \par
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR\
+restriction, including without limitation the rights to use, \par
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR\
+copy, modify, merge, publish, distribute, sublicense, and/or \par
-PERFORMANCE OF THIS SOFTWARE.\
+sell copies of the Software, and to permit persons to whom the \par
-\
+Software is furnished to do so, subject to the following conditions:\par
-
+\par
-\b python-certifi
+The above copyright notice and this permission notice shall be included \par
-\b0 \
+in all copies or substantial portions of the Software.\par
-\
+\par
-This Source Code Form is subject to the terms of the Mozilla Public License,\
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS \par
-v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain\
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, \par
-one at http://mozilla.org/MPL/2.0/.\
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL \par
-\
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER \par
-
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING \par
-\b cffi
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER \par
-\b0 \
+DEALINGS IN THE SOFTWARE.\par
-\
+\par
-\pard\pardeftab720\partightenfactor0
+\b service-identity\b0\par
-\cf0 This package has been mostly done by Armin Rigo with help from\
+\par
-Maciej Fija\uc0\u322 kowski. The idea is heavily based (although not directly\
+Copyright (c) 2014 Hynek Schlawack\par
-copied) from LuaJIT ffi by Mike Pall.\
+\par
-\
+Permission is hereby granted, free of charge, to any person obtaining a copy of\par
-Other contributors:\
+this software and associated documentation files (the "Software"), to deal in\par
-\
+the Software without restriction, including without limitation the rights to\par
-  Google Inc.\
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies\par
-\pard\tx529\pardeftab529\pardirnatural\partightenfactor0
+of the Software, and to permit persons to whom the Software is furnished to do\par
-\cf0 \
+so, subject to the following conditions:\par
-The MIT License\
+\par
-\
+The above copyright notice and this permission notice shall be included in all\par
-Permission is hereby granted, free of charge, to any person \
+copies or substantial portions of the Software.\par
-obtaining a copy of this software and associated documentation \
+\par
-files (the "Software"), to deal in the Software without \
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\par
-restriction, including without limitation the rights to use, \
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\par
-copy, modify, merge, publish, distribute, sublicense, and/or \
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\par
-sell copies of the Software, and to permit persons to whom the \
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\par
-Software is furnished to do so, subject to the following conditions:\
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\par
-\
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\par
-The above copyright notice and this permission notice shall be included \
+SOFTWARE.\par
-in all copies or substantial portions of the Software.\
+\par
-\
+\b pyopenssl\b0\par
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS \
+\par
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, \
+Licensed under the Apache License, Version 2.0 (the \ldblquote License\rdblquote ); you may not use this file\par
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL \
+except in compliance with the License. You may obtain a copy of the License at\par
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER \
+\par
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING \
+{{\field{\*\fldinst{HYPERLINK http://www.apache.org/licenses/LICENSE-2.0 }}{\fldrslt{http://www.apache.org/licenses/LICENSE-2.0\ul0\cf0}}}}\f1\fs24\par
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER \
+\par
-DEALINGS IN THE SOFTWARE.\
+Unless required by applicable law or agreed to in writing, software distributed under the \par
-\
+License is distributed on an \ldblquote AS IS\rdblquote  BASIS, WITHOUT WARRANTIES OR CONDI-\par
-
+TIONS OF ANY KIND, either express or implied. See the License for the specific lang-\par
-\b service-identity
+uage governing permissions and limitations under the License.\par
-\b0 \
+\par
-\
+\b cryptography\b0\par
-Copyright (c) 2014 Hynek Schlawack\
+\par
-\
+Authors listed here: {{\field{\*\fldinst{HYPERLINK https://github.com/pyca/cryptography/blob/master/AUTHORS.rst }}{\fldrslt{https://github.com/pyca/cryptography/blob/master/AUTHORS.rst\ul0\cf0}}}}\f1\fs24\par
-Permission is hereby granted, free of charge, to any person obtaining a copy of\
+\par
-this software and associated documentation files (the "Software"), to deal in\
+Licensed under the Apache License, Version 2.0 (the \ldblquote License\rdblquote ); you may not use this file\par
-the Software without restriction, including without limitation the rights to\
+except in compliance with the License. You may obtain a copy of the License at\par
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies\
+\par
-of the Software, and to permit persons to whom the Software is furnished to do\
+{{\field{\*\fldinst{HYPERLINK http://www.apache.org/licenses/LICENSE-2.0 }}{\fldrslt{http://www.apache.org/licenses/LICENSE-2.0\ul0\cf0}}}}\f1\fs24\par
-so, subject to the following conditions:\
+\par
-\
+Unless required by applicable law or agreed to in writing, software distributed under the \par
-The above copyright notice and this permission notice shall be included in all\
+License is distributed on an \ldblquote AS IS\rdblquote  BASIS, WITHOUT WARRANTIES OR CONDI-\par
-copies or substantial portions of the Software.\
+TIONS OF ANY KIND, either express or implied. See the License for the specific lang-\par
-\
+uage governing permissions and limitations under the License.\par
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\
+\par
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\
+\b Darkdetect\b0\par
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\
+\par
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\
+Copyright (c) 2019, Alberto Sottile\par
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\
+All rights reserved.\par
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\
+\par
-SOFTWARE.\
+Redistribution and use in source and binary forms, with or without\par
-\
+modification, are permitted provided that the following conditions are met:\par
-
+    * Redistributions of source code must retain the above copyright\par
-\b pyopenssl
+      notice, this list of conditions and the following disclaimer.\par
-\b0 \
+    * Redistributions in binary form must reproduce the above copyright\par
-\
+      notice, this list of conditions and the following disclaimer in the\par
-Licensed under the Apache License, Version 2.0 (the \'93License\'94); you may not use this file\
+      documentation and/or other materials provided with the distribution.\par
-except in compliance with the License. You may obtain a copy of the License at\
+    * Neither the name of "darkdetect" nor the\par
-\
+      names of its contributors may be used to endorse or promote products\par
-http://www.apache.org/licenses/LICENSE-2.0\
+      derived from this software without specific prior written permission.\par
-\
+\par
-Unless required by applicable law or agreed to in writing, software distributed under the \
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND\par
-License is distributed on an \'93AS IS\'94 BASIS, WITHOUT WARRANTIES OR CONDI-\
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\par
-TIONS OF ANY KIND, either express or implied. See the License for the specific lang-\
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\par
-uage governing permissions and limitations under the License.\
+DISCLAIMED. IN NO EVENT SHALL "Alberto Sottile" BE LIABLE FOR ANY\par
-\
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\par
-
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\par
-\b cryptography
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND\par
-\b0 \
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\par
-\
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\par
-Authors listed here: https://github.com/pyca/cryptography/blob/master/AUTHORS.rst\
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\par
-\
+\par
-Licensed under the Apache License, Version 2.0 (the \'93License\'94); you may not use this file\
+\b Python MPV JSONIPC\par
-except in compliance with the License. You may obtain a copy of the License at\
+\b0\f0\lang2057 Authors listed here: {{\field{\*\fldinst{HYPERLINK https://github.com/iwalton3/python-mpv-jsonipc/ }}{\fldrslt{https://github.com/iwalton3/python-mpv-jsonipc/\ul0\cf0}}}}\f0\fs24  (principal developer Ian Walton / iwalton3)\b\f1\lang9\par
-\
+\par
-http://www.apache.org/licenses/LICENSE-2.0\
+\b0 Licensed under the Apache License, Version 2.0 (the \ldblquote License\rdblquote ); you may not use this file\par
-\
+except in compliance with the License. You may obtain a copy of the License at\par
-Unless required by applicable law or agreed to in writing, software distributed under the \
+\par
-License is distributed on an \'93AS IS\'94 BASIS, WITHOUT WARRANTIES OR CONDI-\
+{{\field{\*\fldinst{HYPERLINK http://www.apache.org/licenses/LICENSE-2.0 }}{\fldrslt{http://www.apache.org/licenses/LICENSE-2.0\ul0\cf0}}}}\f1\fs24\par
-TIONS OF ANY KIND, either express or implied. See the License for the specific lang-\
+\par
-uage governing permissions and limitations under the License.\
+Unless required by applicable law or agreed to in writing, software distributed under the \par
-\
+License is distributed on an \ldblquote AS IS\rdblquote  BASIS, WITHOUT WARRANTIES OR CONDI-\par
-
+TIONS OF ANY KIND, either express or implied. See the License for the specific lang-\par
-\b Darkdetect
+uage governing permissions and limitations under the License.\par
-\b0 \
+\b\par
-\
+\par
-Copyright (c) 2019, Alberto Sottile\
+Icons\par
-All rights reserved.\
+\par
-\
+\b0 Syncplay uses the following icons and images:\par
-Redistribution and use in source and binary forms, with or without\
+\par
-modification, are permitted provided that the following conditions are met:\
+- Silk icon set 1.3\par
-    * Redistributions of source code must retain the above copyright\
+_________________________________________\par
-      notice, this list of conditions and the following disclaimer.\
+Mark James\par
-    * Redistributions in binary form must reproduce the above copyright\
+{{\field{\*\fldinst{HYPERLINK http://www.famfamfam.com/lab/icons/silk/ }}{\fldrslt{http://www.famfamfam.com/lab/icons/silk/\ul0\cf0}}}}\f1\fs24\par
-      notice, this list of conditions and the following disclaimer in the\
+_________________________________________\par
-      documentation and/or other materials provided with the distribution.\
+\par
-    * Neither the name of "darkdetect" nor the\
+This work is licensed under a\par
-      names of its contributors may be used to endorse or promote products\
+Creative Commons Attribution 2.5 License.\par
-      derived from this software without specific prior written permission.\
+[ {{\field{\*\fldinst{HYPERLINK http://creativecommons.org/licenses/by/2.5/ }}{\fldrslt{http://creativecommons.org/licenses/by/2.5/\ul0\cf0}}}}\f1\fs24  ]\par
-\
+\par
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND\
+This means you may use it for any purpose,\par
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\
+and make any changes you like.\par
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\
+All I ask is that you include a link back\par
-DISCLAIMED. IN NO EVENT SHALL "Alberto Sottile" BE LIABLE FOR ANY\
+to this page in your credits.\par
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\
+\par
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\
+Are you using this icon set? Send me an email\par
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND\
+(including a link or picture if available) to\par
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\
+mjames@gmail.com\par
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\
+\par
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\
+Any other questions about this icon set please\par
-\
+contact mjames@gmail.com\par
-
+\par
-\b Icons\
+- Silk Companion 1\par
-\
+\par
-
+
-\b0 Syncplay uses the following icons and images:\
+\pard Copyright Damien Guard - CC-BY 3.0\par
-\
+{{\field{\*\fldinst{HYPERLINK https://damieng.com/creative/icons/silk-companion-1-icons }}{\fldrslt{https://damieng.com/creative/icons/silk-companion-1-icons\ul0\cf0}}}}\f1\fs24\par
-- Silk icon set 1.3\
+\par
-_________________________________________\
+- Padlock free icon\par
-Mark James\
+CC-BY 3.0\par
-http://www.famfamfam.com/lab/icons/silk/\
+Icon made by Maxim Basinski from {{\field{\*\fldinst{HYPERLINK https://www.flaticon.com/free-icon/padlock_291248 }}{\fldrslt{https://www.flaticon.com/free-icon/padlock_291248\ul0\cf0}}}}\f1\fs24\par
-_________________________________________\
+\par
-\
+
-This work is licensed under a\
+\pard\tx529\par
-Creative Commons Attribution 2.5 License.\
+}
-[ http://creativecommons.org/licenses/by/2.5/ ]\
+
-\
-This means you may use it for any purpose,\
-and make any changes you like.\
-All I ask is that you include a link back\
-to this page in your credits.\
-\
-Are you using this icon set? Send me an email\
-(including a link or picture if available) to\
-mjames@gmail.com\
-\
-Any other questions about this icon set please\
-contact mjames@gmail.com\
-\
-- Silk Companion 1\
-\
-\pard\pardeftab720\partightenfactor0
-\cf0 Copyright Damien Guard - CC-BY 3.0\
-https://damieng.com/creative/icons/silk-companion-1-icons\
-\
-- Padlock free icon\
-CC-BY 3.0\
-Icon made by Maxim Basinski from https://www.flaticon.com/free-icon/padlock_291248\
-\
-\pard\tx529\pardeftab529\pardirnatural\partightenfactor0
-\cf0 \
-}

syncplay/ui/ConfigurationGetter.py

@@ -92,7 +92,8 @@ class ConfigurationGetter(object):
             "notificationTimeout": 3,
             "alertTimeout": 5,
             "chatTimeout": 7,
-            "publicServers": []
+            "publicServers": [],
+            "loadPlaylistFromFile": None
         }
 
         self._defaultConfig = self._config.copy()
@@ -307,6 +308,8 @@ class ConfigurationGetter(object):
                     key = "noGui"
                 if key == "clear_gui_data":
                     key = "clearGUIData"
+                if key == "load_playlist_from_file":
+                    key = "loadPlaylistFromFile"
                 self._config[key] = val
 
     def _splitPortAndHost(self, host):
@@ -495,6 +498,8 @@ class ConfigurationGetter(object):
         self._argparser.add_argument('file', metavar='file', type=str, nargs='?', help=getMessage("file-argument"))
         self._argparser.add_argument('--clear-gui-data', action='store_true', help=getMessage("clear-gui-data-argument"))
         self._argparser.add_argument('-v', '--version', action='store_true', help=getMessage("version-argument"))
+        self._argparser.add_argument('--load-playlist-from-file', metavar="loadPlaylistFromFile", type=str, help=getMessage("load-playlist-from-file-argument"))
+
         self._argparser.add_argument('_args', metavar='options', type=str, nargs='*', help=getMessage("args-argument"))
         args = self._argparser.parse_args()
         if args.version:

syncplay/ui/GuiConfiguration.py

@@ -320,7 +320,7 @@ class ConfigDialog(QtWidgets.QDialog):
         try:
             self.lastCheckedForUpdates = settings.value("lastCheckedQt", None)
             if self.lastCheckedForUpdates:
-                if self.config["lastCheckedForUpdates"] is not None and self.config["lastCheckedForUpdates"] is not "":
+                if self.config["lastCheckedForUpdates"] != None and self.config["lastCheckedForUpdates"] != "":
                     if self.lastCheckedForUpdates.toPython() > datetime.strptime(self.config["lastCheckedForUpdates"], "%Y-%m-%d %H:%M:%S.%f"):
                         self.config["lastCheckedForUpdates"] = self.lastCheckedForUpdates.toString("yyyy-MM-d HH:mm:ss.z")
                 else:
@@ -1054,7 +1054,7 @@ class ConfigDialog(QtWidgets.QDialog):
             font.setPointSize(self.config[configName + "RelativeFontSize"])
             font.setWeight(self.config[configName + "FontWeight"])
             font.setUnderline(self.config[configName + "FontUnderline"])
-            value, ok = QtWidgets.QFontDialog.getFont(font)
+            ok, value = QtWidgets.QFontDialog.getFont(font)
             if ok:
                 self.config[configName + "FontFamily"] = value.family()
                 self.config[configName + "RelativeFontSize"] = value.pointSize()
@@ -1420,7 +1420,7 @@ class ConfigDialog(QtWidgets.QDialog):
         if isMacOS():
             initialHeight = self.connectionSettingsGroup.minimumSizeHint().height()+self.mediaplayerSettingsGroup.minimumSizeHint().height()+self.bottomButtonFrame.minimumSizeHint().height()+50
             if self.error:
-                initialHeight += 40            
+                initialHeight += 40
             self.setFixedWidth(self.sizeHint().width())
             self.setFixedHeight(initialHeight)
         else:

syncplay/ui/gui.py

@@ -21,10 +21,15 @@ from syncplay.utils import formatTime, sameFilename, sameFilesize, sameFiledurat
 from syncplay.vendor import Qt
 from syncplay.vendor.Qt import QtCore, QtWidgets, QtGui, __binding__, __binding_version__, __qt_version__, IsPySide, IsPySide2
 from syncplay.vendor.Qt.QtCore import Qt, QSettings, QSize, QPoint, QUrl, QLine, QDateTime
+applyDPIScaling = True
+if isLinux():
+    applyDPIScaling = False
+else:
+    applyDPIScaling = True
 if hasattr(QtCore.Qt, 'AA_EnableHighDpiScaling'):
-    QtWidgets.QApplication.setAttribute(QtCore.Qt.AA_EnableHighDpiScaling, True)
+    QtWidgets.QApplication.setAttribute(QtCore.Qt.AA_EnableHighDpiScaling, applyDPIScaling)
 if hasattr(QtCore.Qt, 'AA_UseHighDpiPixmaps'):
-    QtWidgets.QApplication.setAttribute(QtCore.Qt.AA_UseHighDpiPixmaps, True)
+    QtWidgets.QApplication.setAttribute(QtCore.Qt.AA_UseHighDpiPixmaps, applyDPIScaling)
 if IsPySide2:
     from PySide2.QtCore import QStandardPaths
 if isMacOS() and IsPySide:
@@ -692,9 +697,9 @@ class MainWindow(QtWidgets.QMainWindow):
             pathFound = self._syncplayClient.fileSwitch.findFilepath(firstFile) if not isURL(firstFile) else None
             if self._syncplayClient.userlist.currentUser.file is None or firstFile != self._syncplayClient.userlist.currentUser.file["name"]:
                 if isURL(firstFile):
-                    menu.addAction(QtGui.QPixmap(resourcespath + "world_go.png"), getMessage("openstreamurl-menu-label"), lambda: self.openFile(firstFile, resetPosition=True))
+                    menu.addAction(QtGui.QPixmap(resourcespath + "world_go.png"), getMessage("openstreamurl-menu-label"), lambda: self.openFile(firstFile, resetPosition=True, fromUser=True))
                 elif pathFound:
-                        menu.addAction(QtGui.QPixmap(resourcespath + "film_go.png"), getMessage("openmedia-menu-label"), lambda: self.openFile(pathFound, resetPosition=True))
+                        menu.addAction(QtGui.QPixmap(resourcespath + "film_go.png"), getMessage("openmedia-menu-label"), lambda: self.openFile(pathFound, resetPosition=True, fromUser=True))
             if pathFound:
                 menu.addAction(QtGui.QPixmap(resourcespath + "folder_film.png"),
                                getMessage('open-containing-folder'),
@@ -711,6 +716,10 @@ class MainWindow(QtWidgets.QMainWindow):
         menu.addAction(QtGui.QPixmap(resourcespath + "film_add.png"), getMessage("addfilestoplaylist-menu-label"), lambda: self.OpenAddFilesToPlaylistDialog())
         menu.addAction(QtGui.QPixmap(resourcespath + "world_add.png"), getMessage("addurlstoplaylist-menu-label"), lambda: self.OpenAddURIsToPlaylistDialog())
         menu.addSeparator()
+        menu.addAction(getMessage("loadplaylistfromfile-menu-label"),lambda: self.OpenLoadPlaylistFromFileDialog()) # TODO: Add icon
+        menu.addAction("Load and shuffle playlist from file",lambda: self.OpenLoadPlaylistFromFileDialog(shuffle=True))  # TODO: Add icon and messages_en
+        menu.addAction(getMessage("saveplaylisttofile-menu-label"),lambda: self.OpenSavePlaylistToFileDialog()) # TODO: Add icon
+        menu.addSeparator()
         menu.addAction(QtGui.QPixmap(resourcespath + "film_folder_edit.png"), getMessage("setmediadirectories-menu-label"), lambda: self.openSetMediaDirectoriesDialog())
         menu.addAction(QtGui.QPixmap(resourcespath + "shield_edit.png"), getMessage("settrusteddomains-menu-label"), lambda: self.openSetTrustedDomainsDialog())
         menu.exec_(self.playlist.viewport().mapToGlobal(position))
@@ -753,11 +762,11 @@ class MainWindow(QtWidgets.QMainWindow):
 
             if self._syncplayClient.userlist.currentUser.file is None or filename != self._syncplayClient.userlist.currentUser.file["name"]:
                 if isURL(filename):
-                    menu.addAction(QtGui.QPixmap(resourcespath + "world_go.png"), getMessage("openusersstream-menu-label").format(shortUsername), lambda: self.openFile(filename))
+                    menu.addAction(QtGui.QPixmap(resourcespath + "world_go.png"), getMessage("openusersstream-menu-label").format(shortUsername), lambda: self.openFile(filename, resetPosition=False, fromUser=True))
                 else:
                     pathFound = self._syncplayClient.fileSwitch.findFilepath(filename)
                     if pathFound:
-                        menu.addAction(QtGui.QPixmap(resourcespath + "film_go.png"), getMessage("openusersfile-menu-label").format(shortUsername), lambda: self.openFile(pathFound))
+                        menu.addAction(QtGui.QPixmap(resourcespath + "film_go.png"), getMessage("openusersfile-menu-label").format(shortUsername), lambda: self.openFile(pathFound, resetPosition=False, fromUser=True))
             if self._syncplayClient.isUntrustedTrustableURI(filename):
                 domain = utils.getDomainFromURL(filename)
                 menu.addAction(QtGui.QPixmap(resourcespath + "shield_add.png"), getMessage("addtrusteddomain-menu-label").format(domain), lambda: self.addTrustedDomain(domain))
@@ -814,11 +823,11 @@ class MainWindow(QtWidgets.QMainWindow):
         if self._isTryingToChangeToCurrentFile(filename):
             return
         if isURL(filename):
-            self._syncplayClient._player.openFile(filename, resetPosition=True)
+            self._syncplayClient.openFile(filename, resetPosition=True)
         else:
             pathFound = self._syncplayClient.fileSwitch.findFilepath(filename, highPriority=True)
             if pathFound:
-                self._syncplayClient._player.openFile(pathFound, resetPosition=True)
+                self._syncplayClient.openFile(pathFound, resetPosition=True)
             else:
                 self._syncplayClient.ui.showErrorMessage(getMessage("cannot-find-file-for-playlist-switch-error").format(filename))
 
@@ -841,11 +850,11 @@ class MainWindow(QtWidgets.QMainWindow):
             if self._isTryingToChangeToCurrentFile(filename):
                 return
             if isURL(filename):
-                self._syncplayClient._player.openFile(filename)
+                self._syncplayClient.openFile(filename)
             else:
                 pathFound = self._syncplayClient.fileSwitch.findFilepath(filename, highPriority=True)
                 if pathFound:
-                    self._syncplayClient._player.openFile(pathFound)
+                    self._syncplayClient.openFile(pathFound)
                 else:
                     self._syncplayClient.fileSwitch.updateInfo()
                     self.showErrorMessage(getMessage("switch-file-not-found-error").format(filename))
@@ -1006,7 +1015,7 @@ class MainWindow(QtWidgets.QMainWindow):
             self.mediadirectory = os.path.dirname(fileName)
             self._syncplayClient.fileSwitch.setCurrentDirectory(self.mediadirectory)
             self.saveMediaBrowseSettings()
-            self._syncplayClient._player.openFile(fileName)
+            self._syncplayClient.openFile(fileName, resetPosition=False, fromUser=True)
 
     @needsClient
     def OpenAddFilesToPlaylistDialog(self):
@@ -1041,6 +1050,47 @@ class MainWindow(QtWidgets.QMainWindow):
         self.updatingPlaylist = False
         self.playlist.updatePlaylist(self.getPlaylistState())
 
+    @needsClient
+    def OpenLoadPlaylistFromFileDialog(self, shuffle=False):
+        self.loadMediaBrowseSettings()
+        if isMacOS() and IsPySide:
+            options = QtWidgets.QFileDialog.Options(QtWidgets.QFileDialog.DontUseNativeDialog)
+        else:
+            options = QtWidgets.QFileDialog.Options()
+        self.mediadirectory = ""
+        currentdirectory = os.path.dirname(self._syncplayClient.userlist.currentUser.file["path"]) if self._syncplayClient.userlist.currentUser.file else None
+        if currentdirectory and os.path.isdir(currentdirectory):
+            defaultdirectory = currentdirectory
+        else:
+            defaultdirectory = self.getInitialMediaDirectory()
+        browserfilter = "Playlists (*.m3u *.m3u8 *.txt)"
+        filepath, filtr = QtWidgets.QFileDialog.getOpenFileName(
+            self, "Load playlist from file", defaultdirectory,
+            browserfilter, "", options) # TODO: Note Shuffle and move to messages_en
+        if os.path.isfile(filepath):
+            self._syncplayClient.playlist.loadPlaylistFromFile(filepath, shuffle=shuffle)
+            self.playlist.updatePlaylist(self.getPlaylistState())
+
+    @needsClient
+    def OpenSavePlaylistToFileDialog(self):
+        self.loadMediaBrowseSettings()
+        if isMacOS() and IsPySide:
+            options = QtWidgets.QFileDialog.Options(QtWidgets.QFileDialog.DontUseNativeDialog)
+        else:
+            options = QtWidgets.QFileDialog.Options()
+        self.mediadirectory = ""
+        currentdirectory = os.path.dirname(self._syncplayClient.userlist.currentUser.file["path"]) if self._syncplayClient.userlist.currentUser.file else None
+        if currentdirectory and os.path.isdir(currentdirectory):
+            defaultdirectory = currentdirectory
+        else:
+            defaultdirectory = self.getInitialMediaDirectory()
+        browserfilter = "Playlist (*.m3u8 *.m3u *.txt)"
+        filepath, filtr = QtWidgets.QFileDialog.getSaveFileName(
+            self, "Save playlist to file", defaultdirectory,
+            browserfilter, "", options) # TODO: Move to messages_en
+        if filepath:
+            self._syncplayClient.playlist.savePlaylistToFile(filepath)
+
     @needsClient
     def OpenAddURIsToPlaylistDialog(self):
         URIsDialog = QtWidgets.QDialog()
@@ -1186,7 +1236,7 @@ class MainWindow(QtWidgets.QMainWindow):
             self, getMessage("promptforstreamurl-msgbox-label"),
             getMessage("promptforstreamurlinfo-msgbox-label"), QtWidgets.QLineEdit.Normal, "")
         if ok and streamURL != '':
-            self._syncplayClient._player.openFile(streamURL)
+            self._syncplayClient.openFile(streamURL, resetPosition=False, fromUser=True)
 
     @needsClient
     def createControlledRoom(self):
@@ -1803,10 +1853,10 @@ class MainWindow(QtWidgets.QMainWindow):
             else:
                 dropfilepath = os.path.abspath(str(url.toLocalFile()))
             if rewindFile == False:
-                self._syncplayClient._player.openFile(dropfilepath)
+                self._syncplayClient.openFile(dropfilepath, resetPosition=False, fromUser=True)
             else:
                 self._syncplayClient.setPosition(0)
-                self._syncplayClient._player.openFile(dropfilepath, resetPosition=True)
+                self._syncplayClient.openFile(dropfilepath, resetPosition=True, fromUser=True)
                 self._syncplayClient.setPosition(0)
 
     def setPlaylist(self, newPlaylist, newIndexFilename=None):
@@ -1848,8 +1898,8 @@ class MainWindow(QtWidgets.QMainWindow):
                 else:
                     self.playlist.insertItem(index, filePath)
 
-    def openFile(self, filePath, resetPosition=False):
+    def openFile(self, filePath, resetPosition=False, fromUser=False):
-        self._syncplayClient._player.openFile(filePath, resetPosition)
+        self._syncplayClient.openFile(filePath, resetPosition, fromUser=fromUser)
 
     def noPlaylistDuplicates(self, filename):
         if self.isItemInPlaylist(filename):

travis/macos-deploy.sh

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+set -ex
+
 mkdir dist/Syncplay.app/Contents/Resources/English.lproj
 mkdir dist/Syncplay.app/Contents/Resources/en_AU.lproj
 mkdir dist/Syncplay.app/Contents/Resources/en_GB.lproj

travis/macos-install.sh

@@ -1,14 +1,29 @@
 #!/usr/bin/env bash
 
-brew update
+set -ex
-brew upgrade python
+
+export HOMEBREW_NO_INSTALL_CLEANUP=1
+
+# Reinstall openssl to fix Python pip install issues
+brew upgrade https://raw.githubusercontent.com/Homebrew/homebrew-core/e9004bd764c9436750a50e0b428548f68fe6a38a/Formula/openssl@1.1.rb
+
+# Python 3.7.4 with 10.12 bottle
+brew upgrade https://raw.githubusercontent.com/Homebrew/homebrew-core/e9004bd764c9436750a50e0b428548f68fe6a38a/Formula/python.rb
+
 which python3
 python3 --version
 which pip3
 pip3 --version
-brew install albertosottile/syncplay/pyside
+
+# Pyside 5.13.0 for 10.12 bottle
+brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/99219f0923014b24f33eae624fbfe83772c35f54/Formula/pyside.rb
+
+# Explicitly upgrade Qt 5.13.1 as the pyside above needs it
+brew upgrade https://raw.githubusercontent.com/Homebrew/homebrew-core/dcc34dd3cb24cb4f7cfa0047ccdb712d7cc4c6e4/Formula/qt.rb
+
 python3 -c "from PySide2 import __version__; print(__version__)"
 python3 -c "from PySide2.QtCore import __version__; print(__version__)" 
+python3 -c "import ssl; print(ssl)"
 pip3 install py2app
 python3 -c "from py2app.recipes import pyside2"
 pip3 install twisted[tls] appnope requests certifi