Merge remote-tracking branch 'iwalton3/master'

README.md

@@ -8,7 +8,8 @@ there are tools to manage them like no other Jellyfin client.
 ## Getting Started
 
 If you are on Windows, simply [download the binary](https://github.com/iwalton3/jellyfin-mpv-shim/releases).
-If you are using Linux, please see the [Linux Installation](https://github.com/iwalton3/jellyfin-mpv-shim/blob/master/README.md#linux-installation) section below.
+If you are using Linux or OSX, please see the [Linux Installation](https://github.com/iwalton3/jellyfin-mpv-shim/blob/master/README.md#linux-installation) or [OSX Installation](https://github.com/iwalton3/jellyfin-mpv-shim/blob/master/README.md#osx-installation)
+sections below.
 
 To use the client, simply launch it and log into your Jellyfin server. You’ll need to enter the
 URL to your server, for example `http://server_ip:8096` or `https://secure_domain`. Make sure to
@@ -118,7 +119,8 @@ All of these settings apply to direct play and are adjustable through the contro
 The client now supports using an external copy of MPV, including one that is running prior to starting
 the client. This may be useful if your distribution only provides MPV as a binary executable (instead
 of as a shared library), or to connect to MPV-based GUI players. Please note that SMPlayer exhibits
-strange behaviour when controlled in this manner.
+strange behaviour when controlled in this manner. External MPV is currently the only working backend
+for media playback on OSX.
 
 - `mpv_ext` - Enable usage of the external player by default. Default: `false`
     - The external player may still be used by default if `libmpv1` is not available.
@@ -198,6 +200,25 @@ sudo ./install
 sudo ldconfig
 ```
 
+## OSX Installation
+Currently on OSX only the external MPV backend seems to be working. I cannot test on OSX, so please report any issues you find.
+
+To install the CLI version:
+
+1. Install brew. ([Instructions](https://brew.sh/))
+2. Install python3 and mpv. `brew install python mpv`
+3. Install jellyfin-mpv-shim. `pip3 install --upgrade jellyfin-mpv-shim`
+4. Run `jellyfin-mpv-shim`.
+
+If you'd like to install the GUI version, you need a working copy of tkinter.
+
+1. Install pyenv. ([Instructions](https://medium.com/python-every-day/python-development-on-macos-with-pyenv-2509c694a808))
+2. Install TK and mpv. `brew install tcl-tk mpv`
+3. Install python3 with TK support. `FLAGS="-I$(brew --prefix tcl-tk)/include" pyenv install 3.8.1`
+4. Set this python3 as the default. `pyenv global 3.8.1`
+5. Install jellyfin-mpv-shim and pystray. `pip3 install --upgrade jellyfin-mpv-shim pystray`
+6. Run `jellyfin-mpv-shim`.
+
 ## Building on Windows
 
 There is a prebuilt version for Windows in the releases section. When

jellyfin_mpv_shim/conf.py

@@ -5,6 +5,7 @@ import pickle as pickle
 import socket
 import json
 import os.path
+import sys
 
 log = logging.getLogger('conf')
 
@@ -35,7 +36,7 @@ class Settings(object):
         "fullscreen":           True,
         "enable_gui":           True,
         "media_key_seek":       False,
-        "mpv_ext":              False,
+        "mpv_ext":              sys.platform.startswith("darwin"),
         "mpv_ext_path":         None,
         "mpv_ext_ipc":          None,
         "mpv_ext_start":        True,

jellyfin_mpv_shim/constants.py

@@ -1,4 +1,4 @@
 APP_NAME = 'jellyfin-mpv-shim'
 USER_APP_NAME = 'Jellyfin MPV Shim'
-CLIENT_VERSION = "1.3.7"
+CLIENT_VERSION = "1.3.9"
 USER_AGENT = "Jellyfin-MPV-Shim/%s" % CLIENT_VERSION

jellyfin_mpv_shim/event_handler.py

@@ -1,4 +1,5 @@
 import logging
+import os
 
 from .utils import plex_color_to_mpv
 from .conf import settings

jellyfin_mpv_shim/mpv_shim.py

@@ -3,6 +3,7 @@
 import logging
 import sys
 import time
+import multiprocessing
 
 logging.basicConfig(level=logging.DEBUG, stream=sys.stdout, format="%(asctime)s [%(levelname)8s] %(message)s")
 
@@ -18,6 +19,9 @@ def main():
     conf_file = conffile.get(APP_NAME, 'conf.json')
     settings.load(conf_file)
 
+    if sys.platform.startswith("darwin"):
+        multiprocessing.set_start_method('forkserver')
+
     userInterface = None
     use_gui = False
     if settings.enable_gui and settings.display_mirroring:

setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setup(
     name='jellyfin-mpv-shim',
-    version='1.3.7',
+    version='1.3.10',
     author="Ian Walton",
     author_email="iwalton3@gmail.com",
     description="Cast media from Jellyfin Mobile and Web apps to MPV. (Unofficial)",
@@ -26,6 +26,6 @@ setup(
         "Operating System :: OS Independent",
     ],
     python_requires='>=3.6',
-    install_requires=['python-mpv', 'jellyfin-apiclient-python>=1.4.0', 'python-mpv-jsonipc>=1.1.3'],
+    install_requires=['python-mpv', 'jellyfin-apiclient-python>=1.4.0', 'python-mpv-jsonipc>=1.1.5'],
     include_package_data=True
 )