Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e052a45800 | ||
|
|
3295e121c2 |
@ -306,7 +306,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
|
||||
|
||||
10
app/music.py
10
app/music.py
@ -153,14 +153,20 @@ class Music:
|
||||
with lock:
|
||||
return self.player.set_time(ms)
|
||||
|
||||
def set_volume(self, volume):
|
||||
"""Set maximum volume used for player"""
|
||||
def set_volume(self, volume, set_default=True):
|
||||
"""
|
||||
Set maximum volume used for player
|
||||
|
||||
Update default volume if set_default == True
|
||||
"""
|
||||
|
||||
with lock:
|
||||
if not self.player:
|
||||
return
|
||||
|
||||
if set_default:
|
||||
self.max_volume = volume
|
||||
|
||||
self.player.audio_set_volume(volume)
|
||||
|
||||
def stop(self):
|
||||
|
||||
@ -314,9 +314,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:
|
||||
"""
|
||||
|
||||
Loading…
Reference in New Issue
Block a user