Skip to content
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

Jump to bottom

*: move mpv.py to feeluown/mpv.py #814

Merged
merged 1 commit into from
Mar 13, 2024
Merged

*: move mpv.py to feeluown/mpv.py #814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
*: move mpv.py to feeluown/mpv.py
  • Loading branch information
@cosven
cosven committed Mar 12, 2024
commit 83d628688378913f994493ba01cad8411f12e0d4
2 changes: 1 addition & 1 deletion examples/research/mpv_render.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# HELP: currently, we need import GL module，otherwise it will raise seg fault on Linux(Ubuntu 18.04)
# from OpenGL import GL # noqa

from mpv import MPV, OpenGlCbGetProcAddrFn, MpvRenderContext
from feeluown.mpv import MPV, OpenGlCbGetProcAddrFn, MpvRenderContext


def get_proc_addr(_, name):
Expand Down
4 changes: 3 additions & 1 deletion feeluown/gui/widgets/mpv_.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
from PyQt5.QtCore import QMetaObject, pyqtSlot, QSize
from PyQt5.QtOpenGL import QGLContext

from mpv import MpvRenderContext, OpenGlCbGetProcAddrFn, _mpv_set_property_string
from feeluown.mpv import (
MpvRenderContext, OpenGlCbGetProcAddrFn, _mpv_set_property_string
)

from feeluown.gui.widgets.video import VideoOpenGLWidget
from feeluown.gui.helpers import IS_MACOS
Expand Down
0 mpv.py → feeluown/mpv.py
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion feeluown/player/mpvplayer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import math
import os

from mpv import ( # type: ignore
from feeluown.mpv import ( # type: ignore
MPV,
MpvEventID,
MpvEventEndFile,
Expand Down
3 changes: 2 additions & 1 deletion setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ ignore = E402

[flake8]
max-line-length = 89
exclude = feeluown/mpv.py

[yapf]
column_limit = 89
Expand Down Expand Up @@ -36,5 +37,5 @@ addopts = -q
--cov-report=
--cov=feeluown
--doctest-modules
[mypy-mpv]
[mypy-feeluown.mpv]
ignore_errors = True
1 change: 0 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
author='feeluown',
author_email='[email protected]',
packages=find_packages(exclude=('tests*',)),
py_modules=['mpv'],
package_data={
'': ['nowplaying/linux/*.xml',
'gui/assets/icons/*.png',
Expand Down
Loading