Skip to content

Move python_mpv_jsonipc in our vendor folder #369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Et0h merged 2 commits into from
Dec 4, 2020
Merged

Move python_mpv_jsonipc in our vendor folder #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00ead14
Move python_mpv_jsonipc to the vendor folder
albertosottile Nov 29, 2020
dcb891c
Adapt players code to the new path
albertosottile Nov 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion syncplay/players/ipc_iina.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import subprocess
import time

from syncplay.players.python_mpv_jsonipc.python_mpv_jsonipc import log, MPV, MPVError, MPVProcess
from syncplay.vendor.python_mpv_jsonipc.python_mpv_jsonipc import log, MPV, MPVError, MPVProcess
from syncplay.utils import resourcespath

class IINA(MPV):
Expand Down
5 changes: 2 additions & 3 deletions syncplay/players/mpv.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,10 @@

from syncplay import constants
from syncplay.messages import getMessage
from syncplay.players.basePlayer import BasePlayer
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
from syncplay.vendor.python_mpv_jsonipc.python_mpv_jsonipc import MPV

class MpvPlayer(BasePlayer):
RE_VERSION = re.compile(r'.*mpv (\d+)\.(\d+)\.\d+.*')
Expand Down
0 ...lay/players/python_mpv_jsonipc/LICENSE.md → ...play/vendor/python_mpv_jsonipc/LICENSE.md
View file
Open in desktop
File renamed without changes.
0 ...play/players/python_mpv_jsonipc/README.md → syncplay/vendor/python_mpv_jsonipc/README.md
View file
Open in desktop
File renamed without changes.
0 ...ay/players/python_mpv_jsonipc/__init__.py → ...lay/vendor/python_mpv_jsonipc/__init__.py
View file
Open in desktop
File renamed without changes.
0 syncplay/players/python_mpv_jsonipc/docs.md → syncplay/vendor/python_mpv_jsonipc/docs.md
View file
Open in desktop
File renamed without changes.
0 .../python_mpv_jsonipc/python_mpv_jsonipc.py → .../python_mpv_jsonipc/python_mpv_jsonipc.py
View file
Open in desktop
File renamed without changes.
0 syncplay/players/python_mpv_jsonipc/setup.py → syncplay/vendor/python_mpv_jsonipc/setup.py
View file
Open in desktop
File renamed without changes.