kae/musicmuster
1
0
Fork 0
Code Issues 28 Pull Requests Projects Releases 1 Activity

Unifty format of VLC config variables

Browse Source
This commit is contained in:
Keith Edmunds 2024-05-05 17:52:38 +01:00
parent f7f5579c25
commit b86f0ac1b7
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/config.py
View File

@ -89,8 +89,10 @@ class Config(object):
TEXT_NO_TRACK_NO_NOTE = "[Section header]" TEXT_NO_TRACK_NO_NOTE = "[Section header]"
TOD_TIME_FORMAT = "%H:%M:%S" TOD_TIME_FORMAT = "%H:%M:%S"
TRACK_TIME_FORMAT = "%H:%M:%S" TRACK_TIME_FORMAT = "%H:%M:%S"
VOLUME_VLC_DEFAULT = 75 VLC_MAIN_PLAYER_NAME = "MusicMuster Main Player"
VOLUME_VLC_DROP3db = 65 VLC_PREVIEW_PLAYER_NAME = "MusicMuster Preview Player"
VLC_VOLUME_DEFAULT = 75
VLC_VOLUME_DROP3db = 65
WARNING_MS_BEFORE_FADE = 5500 WARNING_MS_BEFORE_FADE = 5500
WARNING_MS_BEFORE_SILENCE = 5500 WARNING_MS_BEFORE_SILENCE = 5500
WEB_ZOOM_FACTOR = 1.2 WEB_ZOOM_FACTOR = 1.2

5
app/music.py
View File

@ -60,8 +60,9 @@ class Music:
def __init__(self) -> None: def __init__(self) -> None:
self.VLC = vlc.Instance() self.VLC = vlc.Instance()
self.VLC.set_user_agent = (Config.VLC_MAIN_PLAYER_NAME, Config.VLC_MAIN_PLAYER_NAME)
self.player = None self.player = None
self.max_volume = Config.VOLUME_VLC_DEFAULT self.max_volume = Config.VLC_VOLUME_DEFAULT
self.start_dt: Optional[dt.datetime] = None self.start_dt: Optional[dt.datetime] = None
def fade(self, fade_seconds: int = Config.FADEOUT_SECONDS) -> None: def fade(self, fade_seconds: int = Config.FADEOUT_SECONDS) -> None:
@ -162,7 +163,7 @@ class Music:
self.max_volume = volume self.max_volume = volume
if volume is None: if volume is None:
volume = Config.VOLUME_VLC_DEFAULT volume = Config.VLC_VOLUME_DEFAULT
self.player.audio_set_volume(volume) self.player.audio_set_volume(volume)
# Ensure volume correct # Ensure volume correct

2
app/musicmuster.py
View File

@ -715,7 +715,7 @@ class Window(QMainWindow, Ui_MainWindow):
"""Drop music level by 3db if button checked""" """Drop music level by 3db if button checked"""
if self.btnDrop3db.isChecked(): if self.btnDrop3db.isChecked():
self.music.set_volume(Config.VOLUME_VLC_DROP3db, set_default=False) self.music.set_volume(Config.VLC_VOLUME_DROP3db, set_default=False)
else: else:
self.music.set_volume(Config.VOLUME_VLC_DEFAULT, set_default=False) self.music.set_volume(Config.VOLUME_VLC_DEFAULT, set_default=False)