MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-02-10 05:08:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

[player] Get rid of listener notifications direct from outputs

Browse Source 
Try to consolidate in player.c
This commit is contained in:
ejurgensen 2020-05-25 00:04:33 +02:00
parent 010185eab5
commit 9308f81224
3 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/outputs.c
View File

@ -34,7 +34,6 @@
#include "logger.h" #include "logger.h"
#include "misc.h" #include "misc.h"
#include "transcode.h" #include "transcode.h"
#include "listener.h"
#include "db.h" #include "db.h"
#include "player.h" //TODO remove me when player_pmap is removed again #include "player.h" //TODO remove me when player_pmap is removed again
#include "worker.h" #include "worker.h"
@ -683,14 +682,6 @@ outputs_cb(int callback_id, uint64_t device_id, enum output_device_state state)
event_active(outputs_deferredev, 0, 0); event_active(outputs_deferredev, 0, 0);
} }
// Maybe not so great, seems it would be better if integrated into the callback
// mechanism so that the notifications where at least deferred
void
outputs_listener_notify(void)
{
listener_notify(LISTENER_SPEAKER);
}
/* ---------------------------- Called by player ---------------------------- */ /* ---------------------------- Called by player ---------------------------- */

3
src/outputs.h
View File

@ -275,9 +275,6 @@ outputs_quality_unsubscribe(struct media_quality *quality);
void void
outputs_cb(int callback_id, uint64_t device_id, enum output_device_state); outputs_cb(int callback_id, uint64_t device_id, enum output_device_state);
void
outputs_listener_notify(void);
/* ---------------------------- Called by player ---------------------------- */ /* ---------------------------- Called by player ---------------------------- */
int int

6
src/outputs/raop.c
View File

@ -1755,10 +1755,6 @@ raop_status(struct raop_session *rs)
outputs_cb(rs->callback_id, rs->device_id, state); outputs_cb(rs->callback_id, rs->device_id, state);
rs->callback_id = -1; rs->callback_id = -1;
// Ugly... fixme...
if (rs->state == RAOP_STATE_UNVERIFIED)
outputs_listener_notify();
} }
static struct raop_master_session * static struct raop_master_session *
@ -4203,8 +4199,6 @@ raop_cb_verification_verify_step2(struct evrtsp_request *req, void *arg)
raop_send_req_options(rs, raop_cb_startup_options, "verify_step2"); raop_send_req_options(rs, raop_cb_startup_options, "verify_step2");
outputs_listener_notify();
return; return;
error: error: