MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2024-12-26 23:25:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

[player] Reverse args to player_speaker_get_byid() for consistency

Browse Source
This commit is contained in:
ejurgensen 2020-01-03 19:38:52 +01:00
parent af1bc27dd5
commit e61e98bcbb
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/httpd_jsonapi.c
View File

@ -1430,7 +1430,7 @@ jsonapi_reply_outputs_get_byid(struct httpd_request *hreq)
return HTTP_BADREQUEST; return HTTP_BADREQUEST;
} }
ret = player_speaker_get_byid(output_id, &speaker_info); ret = player_speaker_get_byid(&speaker_info, output_id);
if (ret < 0) if (ret < 0)
{ {
@ -1520,7 +1520,7 @@ jsonapi_reply_outputs_toggle_byid(struct httpd_request *hreq)
return HTTP_BADREQUEST; return HTTP_BADREQUEST;
} }
ret = player_speaker_get_byid(output_id, &spk); ret = player_speaker_get_byid(&spk, output_id);
if (ret < 0) if (ret < 0)
{ {
DPRINTF(E_LOG, L_WEB, "No output found for the given output id, toggle failed for '%s'\n", hreq->uri_parsed->path); DPRINTF(E_LOG, L_WEB, "No output found for the given output id, toggle failed for '%s'\n", hreq->uri_parsed->path);
@ -2629,7 +2629,7 @@ output_volume_set(int volume, int step, uint64_t output_id)
if (step != 0) if (step != 0)
{ {
// Calculate new output volume from the given step value // Calculate new output volume from the given step value
ret = player_speaker_get_byid(output_id, &speaker_info); ret = player_speaker_get_byid(&speaker_info, output_id);
if (ret < 0) if (ret < 0)
{ {
DPRINTF(E_LOG, L_WEB, "No output found for the given output id .\n"); DPRINTF(E_LOG, L_WEB, "No output found for the given output id .\n");

2
src/player.c
View File

@ -3109,7 +3109,7 @@ player_speaker_set(uint64_t *ids)
} }
int int
player_speaker_get_byid(uint64_t id, struct player_speaker_info *spk) player_speaker_get_byid(struct player_speaker_info *spk, uint64_t id)
{ {
struct speaker_get_param param; struct speaker_get_param param;
int ret; int ret;

2
src/player.h
View File

@ -91,7 +91,7 @@ int
player_speaker_set(uint64_t *ids); player_speaker_set(uint64_t *ids);
int int
player_speaker_get_byid(uint64_t id, struct player_speaker_info *spk); player_speaker_get_byid(struct player_speaker_info *spk, uint64_t id);
int int
player_speaker_get_byactiveremote(struct player_speaker_info *spk, uint32_t active_remote); player_speaker_get_byactiveremote(struct player_speaker_info *spk, uint32_t active_remote);