app/musicmuster.py

@@ -786,8 +786,6 @@ class Window(QMainWindow, Ui_MainWindow):
             self.hide_played_tracks = True
             self.active_proxy_model().hide_played_tracks(True)
             self.btnHidePlayed.setText("Show played")
-        # Reset row heights
-        self.active_tab().resizeRowsToContents()
 
     def import_track(self) -> None:
         """Import track file"""
@@ -1124,20 +1122,20 @@ class Window(QMainWindow, Ui_MainWindow):
         if not track_sequence.now.path:
             log.error("No path for next track")
             return
-        self.music.play(track_sequence.now.path, position)
 
-        # Note that track is playing
+        # Notify model
-        track_sequence.now.start()
+        self.active_proxy_model().current_track_started()
+
+        # Note that track is now playing
         self.playing = True
 
         # Disable play next controls
         self.disable_play_next_controls()
 
-        # Notify model
-        self.active_proxy_model().current_track_started()
-
         # Update headers
         self.update_headers()
+        track_sequence.now.start()
+        self.music.play(track_sequence.now.path, position)
 
         # Ensure 100% volume
         # For as-yet unknown reasons. sometimes the volume gets

app/playlistmodel.py

@@ -68,8 +68,6 @@ class PlaylistRowData:
         self.played = False
         self.start_gap: Optional[int] = None
         self.title: str = ""
-        self.start_time: Optional[datetime] = None
-        self.end_time: Optional[datetime] = None
 
         self.plrid: int = plr.id
         self.plr_rownum: int = plr.plr_rownum
@@ -95,6 +93,12 @@ class PlaylistRowData:
         )
 
 
+@dataclass
+class StartEndTimes:
+    start_time: Optional[datetime] = None
+    end_time: Optional[datetime] = None
+
+
 class PlaylistModel(QAbstractTableModel):
     """
     The Playlist Model
@@ -123,6 +127,7 @@ class PlaylistModel(QAbstractTableModel):
         super().__init__(*args, **kwargs)
 
         self.playlist_rows: dict[int, PlaylistRowData] = {}
+        self.start_end_times: dict[int, StartEndTimes] = {}
         self.signals = MusicMusterSignals()
         self.played_tracks_hidden = False
 
@@ -254,7 +259,6 @@ class PlaylistModel(QAbstractTableModel):
         """
 
         row_number = track_sequence.now.plr_rownum
-        prd = self.playlist_rows[row_number]
 
         # Sanity check
         if not track_sequence.now.track_id:
@@ -285,8 +289,8 @@ class PlaylistModel(QAbstractTableModel):
                 log.error(f"Can't retrieve plr, {track_sequence.now.plr_id=}")
 
             # Update track times
-            prd.start_time = track_sequence.now.start_time
+            self.start_end_times[row_number].start_time = track_sequence.now.start_time
-            prd.end_time = track_sequence.now.end_time
+            self.start_end_times[row_number].end_time = track_sequence.now.end_time
 
             # Update colour and times for current row
             self.invalidate_row(row_number)
@@ -404,13 +408,15 @@ class PlaylistModel(QAbstractTableModel):
                 return QVariant()
 
         if column == Col.START_TIME.value:
-            start_time = prd.start_time
+            if row in self.start_end_times:
+                start_time = self.start_end_times[row].start_time
                 if start_time:
                     return QVariant(start_time.strftime(Config.TRACK_TIME_FORMAT))
             return QVariant()
 
         if column == Col.END_TIME.value:
-            end_time = prd.end_time
+            if row in self.start_end_times:
+                end_time = self.start_end_times[row].end_time
                 if end_time:
                     return QVariant(end_time.strftime(Config.TRACK_TIME_FORMAT))
             return QVariant()
@@ -1321,15 +1327,15 @@ class PlaylistModel(QAbstractTableModel):
         update_rows: List[int] = []
 
         for row_number in range(len(self.playlist_rows)):
+            stend = self.start_end_times[row_number] = StartEndTimes()
             prd = self.playlist_rows[row_number]
 
             # Reset start_time if this is the current row
             if row_number == track_sequence.now.plr_rownum:
-                prd.start_time = track_sequence.now.start_time
+                stend.start_time = track_sequence.now.start_time
-                prd.end_time = track_sequence.now.end_time
+                stend.end_time = track_sequence.now.end_time
-                update_rows.append(row_number)
                 if not next_start_time:
-                    next_start_time = prd.end_time
+                    next_start_time = stend.end_time
                 continue
 
             # Set start time for next row if we have a current track
@@ -1337,9 +1343,9 @@ class PlaylistModel(QAbstractTableModel):
                 row_number == track_sequence.next.plr_rownum
                 and track_sequence.now.end_time
             ):
-                prd.start_time = track_sequence.now.end_time
+                stend.start_time = track_sequence.now.end_time
-                prd.end_time = prd.start_time + timedelta(milliseconds=prd.duration)
+                stend.end_time = stend.start_time + timedelta(milliseconds=prd.duration)
-                next_start_time = prd.end_time
+                next_start_time = stend.end_time
                 update_rows.append(row_number)
                 continue
 
@@ -1356,18 +1362,15 @@ class PlaylistModel(QAbstractTableModel):
                 < row_number
                 < track_sequence.next.plr_rownum
             ):
-                prd.start_time = None
-                prd.end_time = None
                 update_rows.append(row_number)
                 continue
 
-            # Reset start time if timing in header
+            # Reset start time if timing in header or at current track
             if self.is_header_row(row_number):
                 header_time = get_embedded_time(prd.note)
                 if header_time:
                     next_start_time = header_time
-                continue
+            else:
-
                 # This is an unplayed track
                 # Don't schedule unplayable tracks
                 if file_is_unreadable(prd.path):
@@ -1376,19 +1379,14 @@ class PlaylistModel(QAbstractTableModel):
                 # Set start/end if we have a start time
                 if next_start_time is None:
                     continue
-
+                if stend.start_time != next_start_time:
-            # Update start time of this row if it's incorrect
+                    stend.start_time = next_start_time
-            if prd.start_time != next_start_time:
-                prd.start_time = next_start_time
                     update_rows.append(row_number)
-
+                next_start_time += timedelta(
-            # Calculate next start time
+                    milliseconds=self.playlist_rows[row_number].duration
-            next_start_time += timedelta(milliseconds=prd.duration)
+                )
-
+                if stend.end_time != next_start_time:
-            # Update end time of this row if it's incorrect
+                    stend.end_time = next_start_time
-            if prd.end_time != next_start_time:
-                prd.end_time = next_start_time
-                if row_number not in update_rows:
                     update_rows.append(row_number)
 
         # Update start/stop times of rows that have changed