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

WIP: remove some references to preview track manager

Browse Source
This commit is contained in:
Keith Edmunds 2024-07-03 14:01:34 +01:00
parent 4fe6e9186c
commit a971298982
2 changed files with 13 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/musicmuster.py
View File

@ -56,7 +56,6 @@ from playlistmodel import PlaylistModel, PlaylistProxyModel
from playlists import PlaylistTab from playlists import PlaylistTab
from trackmanager import ( from trackmanager import (
MainTrackManager, MainTrackManager,
PreviewTrackManager,
track_sequence, track_sequence,
) )
from ui import icons_rc # noqa F401 from ui import icons_rc # noqa F401
@ -153,8 +152,6 @@ class Window(QMainWindow, Ui_MainWindow):
self.timer500: QTimer = QTimer() self.timer500: QTimer = QTimer()
self.timer1000: QTimer = QTimer() self.timer1000: QTimer = QTimer()
self.preview_track_manager: Optional[PreviewTrackManager] = None
self.set_main_window_size() self.set_main_window_size()
self.lblSumPlaytime = QLabel("") self.lblSumPlaytime = QLabel("")
self.statusbar.addPermanentWidget(self.lblSumPlaytime) self.statusbar.addPermanentWidget(self.lblSumPlaytime)

53
app/trackmanager.py
View File

@ -366,7 +366,6 @@ class _TrackManager:
player_name: str, player_name: str,
track_id: int, track_id: int,
row_number: int, row_number: int,
preview_player: bool = False,
) -> None: ) -> None:
""" """
Initialises data structure. Initialises data structure.
@ -379,7 +378,6 @@ class _TrackManager:
raise ValueError(f"_TrackPlayer: unable to retreived {track_id=}") raise ValueError(f"_TrackPlayer: unable to retreived {track_id=}")
self.player_name = player_name self.player_name = player_name
self.row_number = row_number self.row_number = row_number
self.preview_player = preview_player
# Check file readable # Check file readable
if file_is_unreadable(track.path): if file_is_unreadable(track.path):
@ -409,29 +407,25 @@ class _TrackManager:
self.player = _Music(name=player_name) self.player = _Music(name=player_name)
# Initialise and add FadeCurve in a thread as it's slow # Initialise and add FadeCurve in a thread as it's slow
if not self.preview_player: self.fadecurve_thread = QThread()
self.fadecurve_thread = QThread() self.worker = _AddFadeCurve(
self.worker = _AddFadeCurve( self,
self, track_path=track.path,
track_path=track.path, track_fade_at=track.fade_at,
track_fade_at=track.fade_at, track_silence_at=track.silence_at,
track_silence_at=track.silence_at, )
) self.worker.moveToThread(self.fadecurve_thread)
self.worker.moveToThread(self.fadecurve_thread) self.fadecurve_thread.started.connect(self.worker.run)
self.fadecurve_thread.started.connect(self.worker.run) self.worker.finished.connect(self.fadecurve_thread.quit)
self.worker.finished.connect(self.fadecurve_thread.quit) self.worker.finished.connect(self.worker.deleteLater)
self.worker.finished.connect(self.worker.deleteLater) self.fadecurve_thread.finished.connect(self.fadecurve_thread.deleteLater)
self.fadecurve_thread.finished.connect(self.fadecurve_thread.deleteLater) self.fadecurve_thread.start()
self.fadecurve_thread.start()
def check_for_end_of_track(self) -> None: def check_for_end_of_track(self) -> None:
""" """
Check whether track has ended. If so, emit track_ended_signal Check whether track has ended. If so, emit track_ended_signal
""" """
if self.preview_player:
return
if self.start_time is None: if self.start_time is None:
return return
@ -530,9 +524,6 @@ class _TrackManager:
Send end of track signal unless we are a preview player Send end of track signal unless we are a preview player
""" """
if not self.preview_player:
self.signals.track_ended_signal.emit()
def stop(self, fade_seconds: int = 0) -> None: def stop(self, fade_seconds: int = 0) -> None:
""" """
Stop this track playing Stop this track playing
@ -641,24 +632,6 @@ class MainTrackManager(_TrackManager):
) )
class PreviewTrackManager(_TrackManager):
"""
Manage previewing tracks
"""
def __init__(self, session: db.Session, track_id: int, row_number: int) -> None:
super().__init__(
session=session,
player_name=Config.VLC_PREVIEW_PLAYER_NAME,
track_id=track_id,
row_number=row_number,
preview_player=True,
)
def __repr__(self) -> str:
return f"<PreviewTrackManager(track_id={self.track_id}>"
class TrackSequence: class TrackSequence:
next: Optional[MainTrackManager] = None next: Optional[MainTrackManager] = None
current: Optional[MainTrackManager] = None current: Optional[MainTrackManager] = None