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

Clear fade graph when clearing next track

Browse Source
This commit is contained in:
Keith Edmunds 2024-07-30 16:36:29 +01:00
parent 59b6b87186
commit bd7fb79610
4 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/classes.py
View File

@ -797,4 +797,22 @@ class TrackSequence:
current: Optional[RowAndTrack] = None current: Optional[RowAndTrack] = None
previous: Optional[RowAndTrack] = None previous: Optional[RowAndTrack] = None
def set_next(self, rat: Optional[RowAndTrack]) -> None:
"""
Set the 'next' track to be passed rat. Clear
any previous next track. If passed rat is None
just clear existing next track.
"""
# Clear any existing fade graph
if self.next and self.next.fade_graph:
self.next.fade_graph.clear()
if rat is None:
self.next = None
else:
self.next = rat
self.next.create_fade_graph()
track_sequence = TrackSequence() track_sequence = TrackSequence()

5
app/musicmuster.py
View File

@ -343,7 +343,7 @@ class Window(QMainWindow, Ui_MainWindow):
Clear next track Clear next track
""" """
track_sequence.next = None track_sequence.set_next(None)
self.update_headers() self.update_headers()
def clear_selection(self) -> None: def clear_selection(self) -> None:
@ -1418,8 +1418,7 @@ class Window(QMainWindow, Ui_MainWindow):
# We want to use play_next() to resume, so copy the previous # We want to use play_next() to resume, so copy the previous
# track to the next track: # track to the next track:
track_sequence.next = track_sequence.previous track_sequence.set_next(track_sequence.previous)
track_sequence.next.create_fade_graph()
# Now resume playing the now-next track # Now resume playing the now-next track
self.play_next(track_sequence.next.resume_marker) self.play_next(track_sequence.next.resume_marker)

5
app/playlistmodel.py
View File

@ -1186,7 +1186,7 @@ class PlaylistModel(QAbstractTableModel):
if row_number is None: if row_number is None:
# Clear next track # Clear next track
if track_sequence.next is not None: if track_sequence.next is not None:
track_sequence.next = None track_sequence.set_next(None)
else: else:
# Get playlistrow_id of row # Get playlistrow_id of row
try: try:
@ -1205,8 +1205,7 @@ class PlaylistModel(QAbstractTableModel):
if track_sequence.next: if track_sequence.next:
old_next_row = track_sequence.next.row_number old_next_row = track_sequence.next.row_number
track_sequence.next = rat track_sequence.set_next(rat)
track_sequence.next.create_fade_graph()
self.invalidate_row(row_number) self.invalidate_row(row_number)
if Config.WIKIPEDIA_ON_NEXT: if Config.WIKIPEDIA_ON_NEXT:

3
app/playlists.py
View File

@ -949,5 +949,6 @@ class PlaylistTab(QTableView):
def _unmark_as_next(self) -> None: def _unmark_as_next(self) -> None:
"""Rescan track""" """Rescan track"""
self.source_model.set_next_row(None) track_sequence.set_next(None)
self.clear_selection() self.clear_selection()
self.signals.next_track_changed_signal.emit()