From ce0c3de40d8b458aa9a73a31abf2a9506633acf3 Mon Sep 17 00:00:00 2001 From: Keith Edmunds Date: Sat, 13 Aug 2022 16:11:55 +0100 Subject: [PATCH] 3dB drop button working --- app/music.py | 23 +++++++++++------------ app/musicmuster.py | 18 +++++++++--------- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/app/music.py b/app/music.py index 563ecae..5ee5842 100644 --- a/app/music.py +++ b/app/music.py @@ -127,18 +127,17 @@ class Music: # # with lock: # return self.player.set_time(ms) -# -# def set_volume(self, volume, set_default=True): -# """Set maximum volume used for player""" -# -# with lock: -# if not self.player: -# return -# -# if set_default: -# self.max_volume = volume -# -# self.player.audio_set_volume(volume) + + def set_volume(self, volume, set_default=True): + """Set maximum volume used for player""" + + if not self.player: + return + + if set_default: + self.max_volume = volume + + self.player.audio_set_volume(volume) def stop(self) -> float: """Immediately stop playing""" diff --git a/app/musicmuster.py b/app/musicmuster.py index a6c0dbf..1f2c6d7 100755 --- a/app/musicmuster.py +++ b/app/musicmuster.py @@ -174,8 +174,8 @@ class Window(QMainWindow, Ui_MainWindow): lambda: self.tabPlaylist.currentWidget().set_selected_as_next()) self.actionSkipToNext.triggered.connect(self.play_next) self.actionStop.triggered.connect(self.stop) + self.btnDrop3db.clicked.connect(self.drop3db) # ***kae -# self.btnDrop3db.clicked.connect(self.drop3db) # self.btnHidePlayed.clicked.connect(self.hide_played) self.btnFade.clicked.connect(self.fade) self.btnStop.clicked.connect(self.stop) @@ -282,14 +282,14 @@ class Window(QMainWindow, Ui_MainWindow): f.write( f"{playdate.track.artist},{playdate.track.title}\n" ) -# -# def drop3db(self) -> None: -# """Drop music level by 3db if button checked""" -# -# if self.btnDrop3db.isChecked(): -# self.music.set_volume(Config.VOLUME_VLC_DROP3db, set_default=False) -# else: -# self.music.set_volume(Config.VOLUME_VLC_DEFAULT, set_default=False) + + def drop3db(self) -> None: + """Drop music level by 3db if button checked""" + + if self.btnDrop3db.isChecked(): + self.music.set_volume(Config.VOLUME_VLC_DROP3db, set_default=False) + else: + self.music.set_volume(Config.VOLUME_VLC_DEFAULT, set_default=False) def enable_play_next_controls(self) -> None: """