diff --git a/app/models.py b/app/models.py index 1d50990..0c9118c 100644 --- a/app/models.py +++ b/app/models.py @@ -317,7 +317,8 @@ class Playlists(Base): # """Returns a list of all playlists ordered by last use""" # # return ( -# session.query(cls).order_by(cls.last_used.desc()) +# session.query(cls).order_by( +# cls.loaded.desc(), cls.last_used.desc()) # ).all() # # @classmethod diff --git a/app/music.py b/app/music.py index f3ae303..2789209 100644 --- a/app/music.py +++ b/app/music.py @@ -153,14 +153,16 @@ # with lock: # return self.player.set_time(ms) # -# def set_volume(self, volume): +# def set_volume(self, volume, set_default=True): # """Set maximum volume used for player""" # # with lock: # if not self.player: # return # -# self.max_volume = volume +# if set_default: +# self.max_volume = volume +# # self.player.audio_set_volume(volume) # # def stop(self): diff --git a/app/musicmuster.py b/app/musicmuster.py index d4b6db8..f02f392 100755 --- a/app/musicmuster.py +++ b/app/musicmuster.py @@ -321,9 +321,9 @@ class Window(QMainWindow, Ui_MainWindow): # """Drop music level by 3db if button checked""" # # if self.btnDrop3db.isChecked(): -# self.music.set_volume(Config.VOLUME_VLC_DROP3db) +# self.music.set_volume(Config.VOLUME_VLC_DROP3db, set_default=False) # else: -# self.music.set_volume(Config.VOLUME_VLC_DEFAULT) +# self.music.set_volume(Config.VOLUME_VLC_DEFAULT, set_default=False) # # def enable_play_next_controls(self) -> None: # """