Merge remote-tracking branch 'origin/master' into prerelease

jellyfin · Dec 23, 2021 · 8c7182b · 8c7182b
2 parents 1737ea7 + 54fc7cb
commit 8c7182b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -54,14 +54,14 @@ jobs:
         curl -L https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-win.zip > ninja.zip
         unzip ninja.zip
         mv ninja.exe build/
-        curl -L https://sourceforge.net/projects/mpv-player-windows/files/libmpv/mpv-dev-x86_64-20211219-git-fd63bf3.7z/download > mpv.7z
+        curl -L https://sourceforge.net/projects/mpv-player-windows/files/libmpv/mpv-dev-x86_64-20211212-git-0e76372.7z/download > mpv.7z
         7z x mpv.7z
         mv include mpv
         mkdir include
         mv mpv include
         mkdir mpv
         mv include mpv
-        mv mpv-2.dll mpv/mpv.dll
+        mv mpv-1.dll mpv/mpv.dll
         mv mpv.def libmpv.dll.a mpv/
         mv mpv build/
       shell: bash
@@ -98,14 +98,14 @@ jobs:
         curl -L https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-win.zip > ninja.zip
         unzip ninja.zip
         mv ninja.exe build/
-        curl -L https://sourceforge.net/projects/mpv-player-windows/files/libmpv/mpv-dev-i686-20211219-git-fd63bf3.7z/download > mpv.7z
+        curl -L https://sourceforge.net/projects/mpv-player-windows/files/libmpv/mpv-dev-i686-20211212-git-0e76372.7z/download > mpv.7z
         7z x mpv.7z
         mv include mpv
         mkdir include
         mv mpv include
         mkdir mpv
         mv include mpv
-        mv mpv-2.dll mpv/mpv.dll
+        mv mpv-1.dll mpv/mpv.dll
         mv mpv.def libmpv.dll.a mpv/
         mv mpv build/
       shell: bash

diff --git a/src/shared/Paths.cpp b/src/shared/Paths.cpp
@@ -101,9 +101,9 @@ QString Paths::socketName(const QString& serverName)
     userName = "unknown";
 
 #ifdef Q_OS_UNIX
-  return QString("/tmp/pmp_%1_%2.sock").arg(serverName).arg(userName);
+  return QString("/tmp/jmp_%1_%2.sock").arg(serverName).arg(userName);
 #else
-  return QString("pmp_%1_%2.sock").arg(serverName).arg(userName);
+  return QString("jmp_%1_%2.sock").arg(serverName).arg(userName);
 #endif
 }