app/music.py

@@ -30,7 +30,7 @@ class Music:
         to hold up the UI during the fade.
         """
 
-        DEBUG("music.fade()")
+        DEBUG("fade()")
 
         if not self.playing():
             return None
@@ -45,7 +45,7 @@ class Music:
         Implementation of fading the current track in a separate thread.
         """
 
-        DEBUG("music._fade()")
+        DEBUG("_fade()")
 
         fade_time = Config.FADE_TIME / 1000
         steps = Config.FADE_STEPS
@@ -75,16 +75,11 @@ class Music:
     def get_playtime(self):
         "Return elapsed play time"
 
-        if not self.player:
-            return None
-
         return self.player.get_time()
 
     def get_position(self):
         "Return current position"
 
-        DEBUG("music.get_position")
-
         return self.player.get_position()
 
     def play(self, path):
@@ -94,7 +89,7 @@ class Music:
         Log and return if path not found.
         """
 
-        DEBUG(f"music.play({path})")
+        DEBUG(f"play({path})")
 
         if not os.access(path, os.R_OK):
             ERROR(f"play({path}): path not found")
@@ -140,15 +135,8 @@ class Music:
     def stop(self):
         "Immediately stop playing"
 
-        DEBUG("music.stop()")
-
-        if not self.player:
-            return None
-
         position = self.player.get_position()
         self.player.stop()
         self.player.release()
-        # Ensure we don't reference player after release
-        self.player = None
 
         return position

app/musicmuster.py

@@ -264,7 +264,7 @@ class Window(QMainWindow, Ui_MainWindow):
         the database object, get it populated and then add tab.
         """
 
-        playlist_table = Playlist(self)
+        playlist_table = Playlist()
         playlist_table.db = playlist_db
         playlist_table.populate()
         idx = self.tabPlaylist.addTab(playlist_table, playlist_db.name)
@@ -389,11 +389,10 @@ class Window(QMainWindow, Ui_MainWindow):
             playlist = Playlists.open(dlg.plid)
             self.load_playlist(playlist)
 
-    def set_next_track(self, next_track_id=None):
+    def set_next_track(self):
         "Set selected track as next"
 
-        if not next_track_id:
-            next_track_id = self.visible_playlist().set_selected_as_next()
+        next_track_id = self.visible_playlist().set_selected_as_next()
         if next_track_id:
             if self.next_track_playlist != self.visible_playlist():
                 if self.next_track_playlist:

app/playlists.py

@@ -37,7 +37,6 @@ class Playlist(QTableWidget):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-        self.master_process = self.parent()
         self.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
         self.setAlternatingRowColors(True)
         self.setSelectionMode(QtWidgets.QAbstractItemView.ExtendedSelection)
@@ -643,11 +642,12 @@ class Playlist(QTableWidget):
         if row in self._meta_get_notes():
             return None
 
-        track_id = self._get_row_id(row)
-        if track_id:
-            self._meta_set_next(self.currentRow())
+        if self.item(row, self.COL_INDEX):
+            self._meta_set_next(row)
             self._repaint(save_playlist=False)
-            self.master_process.set_next_track(track_id)
+            return self._get_row_id(row)
+        else:
+            return None
 
     def _repaint(self, clear_selection=True, save_playlist=True):
         "Set row colours, fonts, etc, and save playlist"