MyFavMirrors
/
owntone-server
mirror of https://github.com/owntone/owntone-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[player] Clear up return value of outputs_start() 

Should return 0 if no devices at all, or if none selected. Should not return
negative from failure to stop unselected devices.
This commit is contained in:
ejurgensen 2020-09-06 00:08:40 +02:00
parent 7040382688
commit 500f57ba1a
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/outputs.c
View File

@ -1018,19 +1018,27 @@ outputs_start(output_status_cb started_cb, output_status_cb stopped_cb, bool onl
{
struct output_device *device;
int pending = 0;
int ret = -1;
int ret;
for (device = outputs_device_list; device; device = device->next)
{
if (device->selected)
ret = outputs_device_start(device, started_cb, only_probe);
else
ret = outputs_device_stop(device, stopped_cb);
if (ret < 0)
continue;
pending += ret;
ret = outputs_device_stop(device, stopped_cb);
if (ret > 0)
pending += ret;
}
ret = 0; // We don't care about devices that returned an error on stop
for (device = outputs_device_list; device; device = device->next)
{
if (!device->selected)
continue;
ret = outputs_device_start(device, started_cb, only_probe);
if (ret > 0)
pending += ret;
}
return (pending > 0) ? pending : ret;
@ -1045,9 +1053,6 @@ outputs_stop(output_status_cb cb)
for (device = outputs_device_list; device; device = device->next)
{
if (!device->session)
continue;
ret = outputs_device_stop(device, cb);
if (ret < 0)
continue;