From 5d7b55a0abfe07d4874c3e93c4d0d1f1780030df Mon Sep 17 00:00:00 2001 From: Keith Edmunds Date: Sat, 19 Apr 2025 18:25:56 +0100 Subject: [PATCH] Change track_ended_signal to signal_track_ended --- app/classes.py | 2 +- app/music_manager.py | 2 +- app/musicmuster.py | 8 ++++---- app/playlistmodel.py | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/classes.py b/app/classes.py index 7282d99..8bdc796 100644 --- a/app/classes.py +++ b/app/classes.py @@ -291,7 +291,7 @@ class MusicMusterSignals(QObject): status_message_signal = pyqtSignal(str, int) # Emitted when track ends or is manually faded - track_ended_signal = pyqtSignal(int) + signal_track_ended = pyqtSignal(int) def __post_init__(self): super().__init__() diff --git a/app/music_manager.py b/app/music_manager.py index e44f071..4270ac7 100644 --- a/app/music_manager.py +++ b/app/music_manager.py @@ -237,7 +237,7 @@ class Music: with lock: if self.end_of_track_signalled: return - self.signals.track_ended_signal.emit(self.playlist_id) + self.signals.signal_track_ended.emit(self.playlist_id) self.end_of_track_signalled = True def stop(self) -> None: diff --git a/app/musicmuster.py b/app/musicmuster.py index 74c36f4..9f9db7e 100755 --- a/app/musicmuster.py +++ b/app/musicmuster.py @@ -144,8 +144,8 @@ class SignalMonitor: self.signals.status_message_signal.connect( partial(self.show_signal, "status_message_signal ") ) - self.signals.track_ended_signal.connect( - partial(self.show_signal, "track_ended_signal ") + self.signals.signal_track_ended.connect( + partial(self.show_signal, "signal_track_ended ") ) def show_signal(self, name: str, *args: Any) -> None: @@ -1745,7 +1745,7 @@ class Window(QMainWindow): self.signals.signal_next_track_changed.connect(self.signal_next_track_changed_handler) self.signals.signal_set_next_track.connect(self.signal_set_next_track_handler) self.signals.status_message_signal.connect(self.show_status_message) - self.signals.track_ended_signal.connect(self.end_of_track_actions) + self.signals.signal_track_ended.connect(self.end_of_track_actions) self.timer10.timeout.connect(self.tick_10ms) self.timer500.timeout.connect(self.tick_500ms) @@ -1820,7 +1820,7 @@ class Window(QMainWindow): # @log_call def end_of_track_actions(self) -> None: """ - Called by track_ended_signal + Called by signal_track_ended Actions required: - Reset track_sequence objects diff --git a/app/playlistmodel.py b/app/playlistmodel.py index 42a9948..055b72b 100644 --- a/app/playlistmodel.py +++ b/app/playlistmodel.py @@ -100,7 +100,7 @@ class PlaylistModel(QAbstractTableModel): self.signals.signal_playlist_selected_rows.connect(self.set_selected_rows) self.signals.signal_set_next_row.connect(self.set_next_row) self.signals.signal_track_started.connect(self.track_started) - self.signals.track_ended_signal.connect(self.previous_track_ended) + self.signals.signal_track_ended.connect(self.previous_track_ended) self.signals.signal_next_track_changed.connect(self.signal_next_track_changed_handler) # Populate self.playlist_rows @@ -983,7 +983,7 @@ class PlaylistModel(QAbstractTableModel): # @log_call def previous_track_ended(self, playlist_id: int) -> None: """ - Notification from track_ended_signal that the previous track has ended. + Notification from signal_track_ended that the previous track has ended. Actions required: - sanity check