igna/ipmpv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed a resolution change bug or two, added IPMPV_CORNER_RADIUS variable to set OSD radius

Browse Source
This commit is contained in:
Ignacio Rivero 2025-02-24 01:51:58 -03:00
parent e5cdd01af2
commit b6e7445d5f
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.venv

8
main.py
View File

@ -28,6 +28,7 @@ os.environ["LC_ALL"] = "C"
os.environ["LANG"] = "C" os.environ["LANG"] = "C"
is_wayland = "WAYLAND_DISPLAY" in os.environ is_wayland = "WAYLAND_DISPLAY" in os.environ
osd_corner_radius = os.environ.get("IPMPV_CORNER_RADIUS")
to_qt_queue = Queue() to_qt_queue = Queue()
from_qt_queue = Queue() from_qt_queue = Queue()
@ -35,7 +36,7 @@ from_qt_queue = Queue()
M3U_URL = os.environ.get('IPMPV_M3U_URL') M3U_URL = os.environ.get('IPMPV_M3U_URL')
class OsdWidget(QWidget): class OsdWidget(QWidget):
def __init__(self, channel_info, width=600, height=165, close_time=5, corner_radius=15): def __init__(self, channel_info, width=600, height=165, close_time=5, corner_radius=int(osd_corner_radius) if osd_corner_radius is not None else 15):
global is_wayland global is_wayland
super().__init__() super().__init__()
@ -338,7 +339,6 @@ def get_current_resolution():
try: try:
if is_wayland: if is_wayland:
wlr_randr_env = os.environ.copy() wlr_randr_env = os.environ.copy()
wlr_randr_env["WAYLAND_DISPLAY"] = "wayland-1"
output = subprocess.check_output(["wlr-randr"], universal_newlines=True, env=wlr_randr_env) output = subprocess.check_output(["wlr-randr"], universal_newlines=True, env=wlr_randr_env)
if "Composite-1" in output.split("\n")[0]: if "Composite-1" in output.split("\n")[0]:
for line in output.split("\n"): for line in output.split("\n"):
@ -352,7 +352,6 @@ def get_current_resolution():
return "288p" return "288p"
else: else:
xrandr_env = os.environ.copy() xrandr_env = os.environ.copy()
xrandr_env["DISPLAY"] = ":0"
output = subprocess.check_output(["xrandr"], universal_newlines=True, env=xrandr_env) output = subprocess.check_output(["xrandr"], universal_newlines=True, env=xrandr_env)
for line in output.split("\n"): for line in output.split("\n"):
if "Composite-1" in line: if "Composite-1" in line:
@ -765,7 +764,6 @@ def toggle_retroarch():
print("Launching RetroArch") print("Launching RetroArch")
retroarch_env = os.environ.copy() retroarch_env = os.environ.copy()
retroarch_env["MESA_GL_VERSION_OVERRIDE"] = "3.3" retroarch_env["MESA_GL_VERSION_OVERRIDE"] = "3.3"
retroarch_env["DISPLAY"] = ":0"
retroarch_p = subprocess.Popen(["/usr/bin/flatpak","run","org.libretro.RetroArch"], env=retroarch_env) retroarch_p = subprocess.Popen(["/usr/bin/flatpak","run","org.libretro.RetroArch"], env=retroarch_env)
return jsonify(state=True) return jsonify(state=True)
@ -819,7 +817,7 @@ def toggle_resolution():
else: else:
xrandr_env = os.environ.copy() xrandr_env = os.environ.copy()
xrandr_env["DISPLAY"] = ":0" xrandr_env["DISPLAY"] = ":0"
subprocess.run(["wlr-randr", "--output", "Composite-1", "--mode", new_res], check=False, env=xrandr_env) subprocess.run(["xrandr", "--output", "Composite-1", "--mode", new_res], check=False, env=xrandr_env)
resolution = get_current_resolution() resolution = get_current_resolution()
return jsonify(res=get_current_resolution()) return jsonify(res=get_current_resolution())