diff --git a/src/musikcore/audio/PlaybackService.cpp b/src/musikcore/audio/PlaybackService.cpp index cfae69033..92c64f01e 100755 --- a/src/musikcore/audio/PlaybackService.cpp +++ b/src/musikcore/audio/PlaybackService.cpp @@ -787,7 +787,6 @@ void PlaybackService::PauseOrResume() { else if (state == PlaybackState::Playing) { transport->Pause(); } - this->PlayPauseChanged(); } bool PlaybackService::IsMuted() { @@ -938,7 +937,7 @@ void PlaybackService::OnStreamEvent(StreamState eventType, std::string uri) { void PlaybackService::OnPlaybackEvent(PlaybackState eventType) { POST(this, MESSAGE_PLAYBACK_EVENT, (int64_t) eventType, 0); if (eventType == PlaybackState::Paused || eventType == PlaybackState::Playing) { - this->PlayPauseChanged(); + this->PlaybackStateChanged(static_cast(eventType)); } } diff --git a/src/musikcore/audio/PlaybackService.h b/src/musikcore/audio/PlaybackService.h index 95052eb69..fc4391315 100755 --- a/src/musikcore/audio/PlaybackService.h +++ b/src/musikcore/audio/PlaybackService.h @@ -58,7 +58,6 @@ namespace musik { namespace core { namespace audio { /* our unique events */ sigslot::signal2 TrackChanged; sigslot::signal0<> ModeChanged; - sigslot::signal0<> PlayPauseChanged; sigslot::signal1 Shuffled; sigslot::signal0<> QueueEdited; diff --git a/src/musikcube/app/window/TransportWindow.cpp b/src/musikcube/app/window/TransportWindow.cpp index 1c98aeef9..c132c7fe7 100755 --- a/src/musikcube/app/window/TransportWindow.cpp +++ b/src/musikcube/app/window/TransportWindow.cpp @@ -391,8 +391,8 @@ TransportWindow::TransportWindow( this->SetFrameVisible(false); this->playback.TrackChanged.connect(this, &TransportWindow::OnPlaybackServiceTrackChanged); this->playback.ModeChanged.connect(this, &TransportWindow::OnPlaybackModeChanged); + this->playback.PlaybackStateChanged.connect(this, &TransportWindow::OnPlaybackStateChanged); this->playback.Shuffled.connect(this, &TransportWindow::OnPlaybackShuffled); - this->playback.PlayPauseChanged.connect(this, &TransportWindow::OnPlayPauseChanged); this->playback.VolumeChanged.connect(this, &TransportWindow::OnTransportVolumeChanged); this->playback.TimeChanged.connect(this, &TransportWindow::OnTransportTimeChanged); this->playback.StreamStateChanged.connect(this, &TransportWindow::OnPlaybackStreamStateChanged); @@ -595,7 +595,7 @@ void TransportWindow::OnTransportVolumeChanged() { DEBOUNCE_REFRESH(TimeMode::Sync, 0); } -void TransportWindow::OnPlayPauseChanged() { +void TransportWindow::OnPlaybackStateChanged(PlaybackState state) { DEBOUNCE_REFRESH(TimeMode::Sync, 0); } diff --git a/src/musikcube/app/window/TransportWindow.h b/src/musikcube/app/window/TransportWindow.h index 6ae461c9a..dc10066bf 100755 --- a/src/musikcube/app/window/TransportWindow.h +++ b/src/musikcube/app/window/TransportWindow.h @@ -119,7 +119,7 @@ namespace musik { void OnPlaybackServiceTrackChanged(size_t index, musik::core::TrackPtr track); void OnPlaybackModeChanged(); - void OnPlayPauseChanged(); + void OnPlaybackStateChanged(musik::core::sdk::PlaybackState); void OnPlaybackStreamStateChanged(musik::core::sdk::StreamState); void OnTransportVolumeChanged(); void OnTransportTimeChanged(double time);