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

Added DEBUG statements to investigate issue #11

Browse Source
This commit is contained in:
Keith Edmunds 2021-06-11 09:05:02 +01:00
parent 6e754c1b3a
commit 8baf01bc60
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/music.py
View File

@ -115,6 +115,8 @@ class Music:
Log and return if path not found. Log and return if path not found.
""" """
DEBUG(f"music.play({path=})", True)
if not os.access(path, os.R_OK): if not os.access(path, os.R_OK):
ERROR(f"play({path}): path not found") ERROR(f"play({path}): path not found")
return return
@ -163,15 +165,15 @@ class Music:
def stop(self): def stop(self):
"Immediately stop playing" "Immediately stop playing"
with lock: DEBUG(f"music.stop(), {self.player=}", True)
DEBUG(f"music.stop(), {self.player=}", True)
with lock:
if not self.player: if not self.player:
return return
position = self.player.get_position() position = self.player.get_position()
self.player.stop() self.player.stop()
DEBUG(f"Releasing player {self.player=}", True) DEBUG(f"music.stop(): Releasing player {self.player=}", True)
self.player.release() self.player.release()
# Ensure we don't reference player after release # Ensure we don't reference player after release
self.player = None self.player = None

18
app/musicmuster.py
View File

@ -354,17 +354,19 @@ class Window(QMainWindow, Ui_MainWindow):
Update metadata and headers, and repaint Update metadata and headers, and repaint
""" """
# If there is no next track set, return.
if not self.next_track:
return
DEBUG( DEBUG(
"play_next(), " "musicmuster.play_next(), "
f"next_track={self.next_track.title if self.next_track else None} " f"next_track={self.next_track.title if self.next_track else None} "
"current_track=" "current_track="
f"{self.current_track.title if self.current_track else None}" f"{self.current_track.title if self.current_track else None}",
True
) )
# If there is no next track set, return.
if not self.next_track:
DEBUG("musicmuster.play_next(): no next track selected", True)
return
with Session() as session: with Session() as session:
# Stop current track, if any # Stop current track, if any
self.stop_playing() self.stop_playing()
@ -374,6 +376,10 @@ class Window(QMainWindow, Ui_MainWindow):
self.current_track_playlist_tab = self.next_track_playlist_tab self.current_track_playlist_tab = self.next_track_playlist_tab
self.next_track = None self.next_track = None
self.next_track_playlist_tab = None self.next_track_playlist_tab = None
DEBUG(
"musicmuster.play_next: calling music.play("
f"{self.current_track.path=})"
)
self.music.play(self.current_track.path) self.music.play(self.current_track.path)
# Update metadata # Update metadata