Change track_ended_signal to signal_track_ended
This commit is contained in:
parent
0124ca6018
commit
5d7b55a0ab
@ -291,7 +291,7 @@ class MusicMusterSignals(QObject):
|
|||||||
status_message_signal = pyqtSignal(str, int)
|
status_message_signal = pyqtSignal(str, int)
|
||||||
|
|
||||||
# Emitted when track ends or is manually faded
|
# Emitted when track ends or is manually faded
|
||||||
track_ended_signal = pyqtSignal(int)
|
signal_track_ended = pyqtSignal(int)
|
||||||
|
|
||||||
def __post_init__(self):
|
def __post_init__(self):
|
||||||
super().__init__()
|
super().__init__()
|
||||||
|
|||||||
@ -237,7 +237,7 @@ class Music:
|
|||||||
with lock:
|
with lock:
|
||||||
if self.end_of_track_signalled:
|
if self.end_of_track_signalled:
|
||||||
return
|
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
|
self.end_of_track_signalled = True
|
||||||
|
|
||||||
def stop(self) -> None:
|
def stop(self) -> None:
|
||||||
|
|||||||
@ -144,8 +144,8 @@ class SignalMonitor:
|
|||||||
self.signals.status_message_signal.connect(
|
self.signals.status_message_signal.connect(
|
||||||
partial(self.show_signal, "status_message_signal ")
|
partial(self.show_signal, "status_message_signal ")
|
||||||
)
|
)
|
||||||
self.signals.track_ended_signal.connect(
|
self.signals.signal_track_ended.connect(
|
||||||
partial(self.show_signal, "track_ended_signal ")
|
partial(self.show_signal, "signal_track_ended ")
|
||||||
)
|
)
|
||||||
|
|
||||||
def show_signal(self, name: str, *args: Any) -> None:
|
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_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.signal_set_next_track.connect(self.signal_set_next_track_handler)
|
||||||
self.signals.status_message_signal.connect(self.show_status_message)
|
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.timer10.timeout.connect(self.tick_10ms)
|
||||||
self.timer500.timeout.connect(self.tick_500ms)
|
self.timer500.timeout.connect(self.tick_500ms)
|
||||||
@ -1820,7 +1820,7 @@ class Window(QMainWindow):
|
|||||||
# @log_call
|
# @log_call
|
||||||
def end_of_track_actions(self) -> None:
|
def end_of_track_actions(self) -> None:
|
||||||
"""
|
"""
|
||||||
Called by track_ended_signal
|
Called by signal_track_ended
|
||||||
|
|
||||||
Actions required:
|
Actions required:
|
||||||
- Reset track_sequence objects
|
- Reset track_sequence objects
|
||||||
|
|||||||
@ -100,7 +100,7 @@ class PlaylistModel(QAbstractTableModel):
|
|||||||
self.signals.signal_playlist_selected_rows.connect(self.set_selected_rows)
|
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_set_next_row.connect(self.set_next_row)
|
||||||
self.signals.signal_track_started.connect(self.track_started)
|
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)
|
self.signals.signal_next_track_changed.connect(self.signal_next_track_changed_handler)
|
||||||
|
|
||||||
# Populate self.playlist_rows
|
# Populate self.playlist_rows
|
||||||
@ -983,7 +983,7 @@ class PlaylistModel(QAbstractTableModel):
|
|||||||
# @log_call
|
# @log_call
|
||||||
def previous_track_ended(self, playlist_id: int) -> None:
|
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:
|
Actions required:
|
||||||
- sanity check
|
- sanity check
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user