Rework RAOP volume setting to be per-speaker

Player now pilots RAOP volume setting directly on a per-speaker basis.
This commit is contained in:
Julien BLACHE
2010-11-19 21:49:17 +01:00
parent 9bd6d459a2
commit 9e9c3e42cc
3 changed files with 41 additions and 37 deletions

View File

@@ -2514,13 +2514,16 @@ volume_set(struct player_command *cmd)
master_volume = cmd->arg.intval;
laudio_volume = master_volume;
cmd->raop_pending = raop_set_volume(master_volume, device_command_cb);
laudio_set_volume(laudio_volume);
cmd->raop_pending = 0;
for (rd = dev_list; rd; rd = rd->next)
{
rd->volume = master_volume;
if (rd->session)
cmd->raop_pending += raop_set_volume_one(rd->session, rd->volume, device_command_cb);
}
if (cmd->raop_pending > 0)
@@ -3501,8 +3504,6 @@ player_init(void)
goto raop_fail;
}
raop_set_volume(master_volume, NULL);
ret = mdns_browse("_raop._tcp", raop_device_cb);
if (ret < 0)
{