mirror of
https://github.com/owntone/owntone-server.git
synced 2025-04-14 00:10:10 -04:00
Merge remote-tracking branch 'origin/master' into web-3.0
This commit is contained in:
commit
5c89fa0882
@ -610,7 +610,7 @@ outputs_device_get(uint64_t device_id)
|
|||||||
return device;
|
return device;
|
||||||
}
|
}
|
||||||
|
|
||||||
DPRINTF(E_WARN, L_PLAYER, "Output device with id %" PRIu64 " has disappeared from our list\n", device_id);
|
DPRINTF(E_WARN, L_PLAYER, "Output device with id %" PRIu64 " is not in our list\n", device_id);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2683,6 +2683,10 @@ speaker_set(void *arg, int *retval)
|
|||||||
// why we want to provide a max_volume.
|
// why we want to provide a max_volume.
|
||||||
max_volume = (player_state != PLAY_STOPPED) ? outputs_volume_get() : -1;
|
max_volume = (player_state != PLAY_STOPPED) ? outputs_volume_get() : -1;
|
||||||
|
|
||||||
|
// Log a warning via outputs_device_get() if a speaker doesn't exist
|
||||||
|
for (i = 1; i <= nspk; i++)
|
||||||
|
outputs_device_get(ids[i]);
|
||||||
|
|
||||||
for (device = outputs_list(); device; device = device->next)
|
for (device = outputs_list(); device; device = device->next)
|
||||||
{
|
{
|
||||||
for (i = 1; i <= nspk; i++)
|
for (i = 1; i <= nspk; i++)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user