app/music.py

@@ -8,8 +8,6 @@ from time import sleep
 
 from log import DEBUG, ERROR
 
-lock = threading.Lock()
-
 
 class Music:
     """
@@ -18,7 +16,7 @@ class Music:
 
     def __init__(self):
         self.current_track_start_time = None
-        self.fading = 0
+        self.fading = False
         self.VLC = vlc.Instance()
         self.player = None
         self.track_path = None
@@ -34,13 +32,13 @@ class Music:
 
         DEBUG("music.fade()", True)
 
-        if not self.player:
+        if not self.playing():
-            return
+            return None
 
-        if not self.player.get_position() > 0 and self.player.is_playing():
+        # Only allow one track to fade at a time
+        if self.fading:
             return
-
+        self.fading = True
-        self.fading += 1
 
         thread = threading.Thread(target=self._fade)
         thread.start()
@@ -53,14 +51,10 @@ class Music:
         # Take a copy of current player to allow another track to be
         # started without interfering here
 
+        p = self.player
+
         DEBUG(f"music._fade(), {self.player=}", True)
 
-        with lock:
-            p = self.player
-            self.player = None
-
-        DEBUG(f"music._fade() post-lock, {self.player=}", True)
-
         fade_time = Config.FADE_TIME / 1000
         steps = Config.FADE_STEPS
         sleep_time = fade_time / steps
@@ -75,38 +69,27 @@ class Music:
         measures_to_reduce_by = 0
         for i in range(1, steps + 1):
             measures_to_reduce_by += i
-            volume_factor = 1 - (
+            volume_factor = 1 - (measures_to_reduce_by / total_measures_count)
-                measures_to_reduce_by / total_measures_count)
             p.audio_set_volume(int(self.max_volume * volume_factor))
             sleep(sleep_time)
 
-        with lock:
+        self.stop(p)
-            DEBUG(f"music._facde(), stopping {p=}", True)
+        self.fading = False
-
-            p.stop()
-            DEBUG(f"Releasing player {p=}", True)
-            p.release()
-            # Ensure we don't reference player after release
-            p = None
-
-        self.fading -= 1
 
     def get_playtime(self):
         "Return elapsed play time"
 
-        with lock:
+        if not self.player:
-            if not self.player:
+            return None
-                return None
 
-            return self.player.get_time()
+        return self.player.get_time()
 
     def get_position(self):
         "Return current position"
 
-        with lock:
+        DEBUG("music.get_position", True)
-            DEBUG("music.get_position", True)
 
-            return self.player.get_position()
+        return self.player.get_position()
 
     def play(self, path):
         """
@@ -135,44 +118,46 @@ class Music:
         get_position seems more reliable.
         """
 
-        with lock:
+        if self.player:
-            if self.player:
+            if self.player.get_position() > 0 and self.player.is_playing():
-                if self.player.get_position() > 0 and self.player.is_playing():
+                return True
-                    return True
 
-            # We take a copy of the player when fading, so we could be
+        # We take a copy of the player when fading, so we could be
-            # playing in a fade nowFalse
+        # playing in a fade nowFalse
-            return self.fading > 0
+        return self.fading
 
     def set_position(self, ms):
         "Set current play time in milliseconds from start"
 
-        with lock:
+        return self.player.set_time(ms)
-            return self.player.set_time(ms)
 
     def set_volume(self, volume):
         "Set maximum volume used for player"
 
-        with lock:
+        if not self.player:
-            if not self.player:
+            return
-                return
 
-            self.max_volume = volume
+        self.max_volume = volume
-            self.player.audio_set_volume(volume)
+        self.player.audio_set_volume(volume)
 
-    def stop(self):
+    def stop(self, player=None):
         "Immediately stop playing"
 
-        with lock:
+        DEBUG(f"music.stop(), {player=}", True)
-            DEBUG(f"music.stop(), {self.player=}", True)
 
+        if not player:
             if not self.player:
                 return
+            player = self.player
 
-            position = self.player.get_position()
+        DEBUG(f"music.stop({player=})")
-            self.player.stop()
+
-            DEBUG(f"Releasing player {self.player=}", True)
+        position = player.get_position()
-            self.player.release()
+        player.stop()
-            # Ensure we don't reference player after release
+        p = player
-            self.player = None
+        # Ensure we don't reference player after release
-            return position
+        player = None
+        DEBUG(f"Releasing player {p=}", True)
+        p.release()
+
+        return position

app/musicmuster.py

@@ -138,11 +138,8 @@ class Window(QMainWindow, Ui_MainWindow):
         self.actionPlay_next.triggered.connect(self.play_next)
         self.actionSearch_database.triggered.connect(self.search_database)
         self.actionSelect_next_track.triggered.connect(self.select_next_track)
-        self.actionSelect_played_tracks.triggered.connect(self.select_played)
         self.actionSelect_previous_track.triggered.connect(
             self.select_previous_track)
-        self.actionSelect_unplayed_tracks.triggered.connect(
-            self.select_unplayed)
         self.actionSetNext.triggered.connect(self.set_next_track)
         self.actionSkip_next.triggered.connect(self.play_next)
         self.actionSkipToEnd.triggered.connect(self.test_skip_to_end)
@@ -432,11 +429,6 @@ class Window(QMainWindow, Ui_MainWindow):
 
         self.visible_playlist_tab().select_next_track()
 
-    def select_played(self):
-        "Select all played tracks in playlist"
-
-        self.visible_playlist_tab().select_played_tracks()
-
     def select_previous_track(self):
         "Select previous or first track in playlist"
 
@@ -457,11 +449,6 @@ class Window(QMainWindow, Ui_MainWindow):
                 self.next_track = Tracks.get_track(session, next_track_id)
             self.update_headers()
 
-    def select_unplayed(self):
-        "Select all unplayed tracks in playlist"
-
-        self.visible_playlist_tab().select_unplayed_tracks()
-
     def show_warning(self, title, msg):
         "Display a warning to user"
 
@@ -504,19 +491,16 @@ class Window(QMainWindow, Ui_MainWindow):
     def stop_playing(self, fade=True):
         "Stop playing current track"
 
-        DEBUG("musicmuster.stop_playing()", True)
+        DEBUG("musicmuster.stop_playing()")
 
         if not self.music.playing():
-            DEBUG("musicmuster.stop_playing(): not playing", True)
             return
 
         self.previous_track_position = self.music.get_position()
         if fade:
-            DEBUG("musicmuster.stop_playing(): fading music", True)
             self.music.fade()
         else:
             self.music.stop()
-            DEBUG("musicmuster.stop_playing(): stopping music", True)
         self.current_track_playlist_tab.clear_current()
 
         # Shuffle tracks along
@@ -566,7 +550,7 @@ class Window(QMainWindow, Ui_MainWindow):
         if not self.even_tick:
             return
 
-        if self.music.player and self.music.playing():
+        if self.music.playing():
             self.playing = True
             playtime = self.music.get_playtime()
             time_to_fade = (self.current_track.fade_at - playtime)

app/playlists.py

@@ -425,21 +425,6 @@ class PlaylistTab(QTableWidget):
 
         self.selectRow(row)
 
-    def select_played_tracks(self):
-        "Select all played tracks in playlist"
-
-        # Need to allow multiple rows to be selected
-        self.setSelectionMode(QtWidgets.QAbstractItemView.MultiSelection)
-
-        self.clearSelection()
-
-        for row in range(self.rowCount()):
-            if self._get_row_id(row) in self.played_tracks:
-                self.selectRow(row)
-
-        # Reset extended selection
-        self.setSelectionMode(QtWidgets.QAbstractItemView.ExtendedSelection)
-
     def select_previous_track(self):
         """
         Select previous or last track. Don't select notes. Wrap at first row.
@@ -473,25 +458,6 @@ class PlaylistTab(QTableWidget):
 
         self.selectRow(row)
 
-    def select_unplayed_tracks(self):
-        "Select all unplayed tracks in playlist"
-
-        # Need to allow multiple rows to be selected
-        self.setSelectionMode(QtWidgets.QAbstractItemView.MultiSelection)
-        notes_rows = self._meta_get_notes()
-
-        self.clearSelection()
-
-        for row in range(self.rowCount()):
-            if row in notes_rows:
-                continue
-            if self._get_row_id(row) in self.played_tracks:
-                continue
-            self.selectRow(row)
-
-        # Reset extended selection
-        self.setSelectionMode(QtWidgets.QAbstractItemView.ExtendedSelection)
-
     def set_selected_as_next(self):
         """
         Sets the selected track as the next track.

app/ui/main_window.ui

@@ -757,8 +757,6 @@ border: 1px solid rgb(85, 87, 83);</string>
     <addaction name="actionAdd_file"/>
     <addaction name="action_Clear_selection"/>
     <addaction name="separator"/>
-    <addaction name="actionSelect_unplayed_tracks"/>
-    <addaction name="actionSelect_played_tracks"/>
     <addaction name="actionMoveSelected"/>
     <addaction name="separator"/>
     <addaction name="actionExport_playlist"/>
@@ -979,16 +977,6 @@ border: 1px solid rgb(85, 87, 83);</string>
     <string>K</string>
    </property>
   </action>
-  <action name="actionSelect_played_tracks">
-   <property name="text">
-    <string>Select played tracks</string>
-   </property>
-  </action>
-  <action name="actionSelect_unplayed_tracks">
-   <property name="text">
-    <string>Select unplayed tracks</string>
-   </property>
-  </action>
  </widget>
  <resources>
   <include location="icons.qrc"/>