oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

player/Listener: add virtual method OnPlayerError()

Browse Source 
Replaces two global idle_add() calls.
This commit is contained in:
Max Kellermann 2022-07-13 13:55:27 +02:00
parent a542a0804a
commit 047561dc22
5 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Partition.cxx
View File

@ -183,6 +183,12 @@ Partition::OnQueueSongStarted() noexcept
EmitIdle(IDLE_PLAYER); EmitIdle(IDLE_PLAYER);
} }
void
Partition::OnPlayerError() noexcept
{
EmitIdle(IDLE_PLAYER);
}
void void
Partition::OnPlayerSync() noexcept Partition::OnPlayerSync() noexcept
{ {

1
src/Partition.hxx
View File

@ -277,6 +277,7 @@ private:
void OnQueueSongStarted() noexcept override; void OnQueueSongStarted() noexcept override;
/* virtual methods from class PlayerListener */ /* virtual methods from class PlayerListener */
void OnPlayerError() noexcept override;
void OnPlayerSync() noexcept override; void OnPlayerSync() noexcept override;
void OnPlayerTagModified() noexcept override; void OnPlayerTagModified() noexcept override;
void OnBorderPause() noexcept override; void OnBorderPause() noexcept override;

4
src/player/Control.cxx
View File

@ -19,6 +19,7 @@
#include "Control.hxx" #include "Control.hxx"
#include "Outputs.hxx" #include "Outputs.hxx"
#include "Listener.hxx"
#include "Idle.hxx" #include "Idle.hxx"
#include "song/DetachedSong.hxx" #include "song/DetachedSong.hxx"
@ -190,6 +191,9 @@ PlayerControl::SetError(PlayerError type, std::exception_ptr &&_error) noexcept
error_type = type; error_type = type;
error = std::move(_error); error = std::move(_error);
// TODO: is it ok to call this while holding mutex lock?
listener.OnPlayerError();
} }
void void

6
src/player/Listener.hxx
View File

@ -22,6 +22,12 @@
class PlayerListener { class PlayerListener {
public: public:
/**
* A playback error has occurred and
* PlayerControl::CheckRethrowError() will provide details.
*/
virtual void OnPlayerError() noexcept = 0;
/** /**
* Must call playlist_sync(). * Must call playlist_sync().
*/ */

4
src/player/Thread.cxx
View File

@ -575,8 +575,6 @@ Player::OpenOutput() noexcept
pc.SetOutputError(std::current_exception()); pc.SetOutputError(std::current_exception());
idle_add(IDLE_PLAYER);
return false; return false;
} }
@ -1065,8 +1063,6 @@ Player::PlayNextChunk() noexcept
pc.LockSetOutputError(std::current_exception()); pc.LockSetOutputError(std::current_exception());
idle_add(IDLE_PLAYER);
return false; return false;
} }