From abc4a6011dc6b0d85aa2d5a125b1e7c912d0a57f Mon Sep 17 00:00:00 2001 From: Nathan Palmer Date: Wed, 27 Dec 2023 13:22:19 -0500 Subject: [PATCH 1/3] Adding an ffmpeg url parameter --- app.py | 8 ++++++++ karaoke.py | 7 ++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/app.py b/app.py index d62cd040..8201e369 100644 --- a/app.py +++ b/app.py @@ -774,6 +774,13 @@ def get_default_dl_dir(platform): default=None, required=False, ), + parser.add_argument( + "-m", + "--ffmpeg-url", + help="Override the ffmpeg address with a supplied URL.", + default=None, + required=False, + ), parser.add_argument( "--hide-overlay", action="store_true", @@ -833,6 +840,7 @@ def get_default_dl_dir(platform): hide_overlay=args.hide_overlay, screensaver_timeout=args.screensaver_timeout, url=args.url, + ffmpeg_url=args.ffmpeg_url, prefer_ip=args.prefer_ip ) diff --git a/karaoke.py b/karaoke.py index 85dfc454..f86415da 100644 --- a/karaoke.py +++ b/karaoke.py @@ -75,6 +75,7 @@ def __init__( hide_overlay=False, screensaver_timeout = 300, url=None, + ffmpeg_url=None, prefer_ip=False ): @@ -151,6 +152,10 @@ def __init__( else: self.url = f"http://{socket.getfqdn().lower()}:{self.port}" self.url_parsed = urlparse(self.url) + if ffmpeg_url is None: + self.ffmpeg_url = f"{self.url_parsed.scheme}://{self.url_parsed.hostname}:{self.ffmpeg_port}" + else: + self.ffmpeg_url = ffmpeg_url # get songs from download_path self.get_available_songs() @@ -360,7 +365,7 @@ def get_youtube_id_from_url(self, url): def play_file(self, file_path, semitones=0): logging.info(f"Playing file: {file_path} transposed {semitones} semitones") stream_uid = int(time.time()) - stream_url = f"{self.url_parsed.scheme}://{self.url_parsed.hostname}:{self.ffmpeg_port}/{stream_uid}" + stream_url = f"{self.ffmpeg_url}/{stream_uid}" # pass a 0.0.0.0 IP to ffmpeg which will work for both hostnames and direct IP access ffmpeg_url = f"http://0.0.0.0:{self.ffmpeg_port}/{stream_uid}" From 76c81b1d36488387a4fc3bd1cfa210df4a89e895 Mon Sep 17 00:00:00 2001 From: Vicwomg Date: Tue, 5 Mar 2024 20:34:46 -0800 Subject: [PATCH 2/3] Update app.py --- app.py | 1 - 1 file changed, 1 deletion(-) diff --git a/app.py b/app.py index 13f9145b..6890a3ad 100644 --- a/app.py +++ b/app.py @@ -831,7 +831,6 @@ def get_default_dl_dir(platform): screensaver_timeout=args.screensaver_timeout, url=args.url, ffmpeg_url=args.ffmpeg_url, - prefer_ip=args.prefer_ip prefer_hostname=args.prefer_hostname ) From b33d734b8777ed490ee2ae3a8987a594937d1a45 Mon Sep 17 00:00:00 2001 From: Vicwomg Date: Tue, 5 Mar 2024 20:35:16 -0800 Subject: [PATCH 3/3] Update karaoke.py --- karaoke.py | 1 - 1 file changed, 1 deletion(-) diff --git a/karaoke.py b/karaoke.py index 712e84e4..7816c333 100644 --- a/karaoke.py +++ b/karaoke.py @@ -76,7 +76,6 @@ def __init__( screensaver_timeout = 300, url=None, ffmpeg_url=None, - prefer_ip=False prefer_hostname=True ):