oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Instance: add method FindOutput() 

Move code from handle_moveoutput().
This commit is contained in:
Max Kellermann 2022-07-13 14:52:13 +02:00
parent 370df37596
commit 8db14c9cb3
3 changed files with 45 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Instance.cxx
View File

@ -90,6 +90,22 @@ Instance::DeletePartition(Partition &partition) noexcept
}
}
AudioOutputControl *
Instance::FindOutput(std::string_view name,
Partition &excluding_partition) noexcept
{
for (auto &partition : partitions) {
if (&partition == &excluding_partition)
continue;
auto *output = partition.outputs.FindByName(name);
if (output != nullptr && !output->IsDummy())
return output;
}
return nullptr;
}
#ifdef ENABLE_DATABASE
const Database &

12
src/Instance.hxx
View File

@ -38,6 +38,7 @@ class InotifyUpdate;
class ClientList;
struct Partition;
class AudioOutputControl;
class StateFile;
class RemoteTagCache;
class StickerDatabase;
@ -171,6 +172,17 @@ struct Instance final
void BeginShutdownPartitions() noexcept;
/**
* Returns the (non-dummy) audio output device with the
* specified name. Returns nullptr if the name does not
* exist.
*
* @param excluding_partition ignore this partition
*/
[[gnu::pure]]
AudioOutputControl *FindOutput(std::string_view name,
Partition &excluding_partition) noexcept;
#ifdef ENABLE_DATABASE
/**
* Returns the global #Database instance. May return nullptr

39
src/command/PartitionCommands.cxx
View File

@ -145,29 +145,24 @@ handle_moveoutput(Client &client, Request request, Response &response)
/* find the partition which owns this output currently */
auto &instance = client.GetInstance();
for (auto &partition : instance.partitions) {
if (&partition == &dest_partition)
continue;
auto *output = partition.outputs.FindByName(output_name);
if (output == nullptr || output->IsDummy())
continue;
const bool was_enabled = output->IsEnabled();
if (existing_output != nullptr)
/* move the output back where it once was */
existing_output->ReplaceDummy(output->Steal(),
was_enabled);
else
/* copy the AudioOutputControl and add it to the output list */
dest_partition.outputs.AddMoveFrom(std::move(*output),
was_enabled);
instance.EmitIdle(IDLE_OUTPUT);
return CommandResult::OK;
auto *output = instance.FindOutput(output_name, dest_partition);
if (output == nullptr) {
response.Error(ACK_ERROR_NO_EXIST, "No such output");
return CommandResult::ERROR;
}
response.Error(ACK_ERROR_NO_EXIST, "No such output");
return CommandResult::ERROR;
const bool was_enabled = output->IsEnabled();
if (existing_output != nullptr)
/* move the output back where it once was */
existing_output->ReplaceDummy(output->Steal(),
was_enabled);
else
/* copy the AudioOutputControl and add it to the output list */
dest_partition.outputs.AddMoveFrom(std::move(*output),
was_enabled);
instance.EmitIdle(IDLE_OUTPUT);
return CommandResult::OK;
}