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

Main: move code to Partition::BeginShutdown()

Browse Source
This commit is contained in:
Max Kellermann 2020-01-20 09:21:56 +01:00
parent f249a755e2
commit 5afec8256a
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Main.cxx
View File

@ -27,7 +27,6 @@
#include "Mapper.hxx" #include "Mapper.hxx"
#include "Permission.hxx" #include "Permission.hxx"
#include "Listen.hxx" #include "Listen.hxx"
#include "client/Listener.hxx"
#include "client/Config.hxx" #include "client/Config.hxx"
#include "client/List.hxx" #include "client/List.hxx"
#include "command/AllCommands.hxx" #include "command/AllCommands.hxx"
@ -349,8 +348,7 @@ inline void
Instance::BeginShutdownPartitions() noexcept Instance::BeginShutdownPartitions() noexcept
{ {
for (auto &partition : partitions) { for (auto &partition : partitions) {
partition.pc.Kill(); partition.BeginShutdown();
partition.listener.reset();
} }
} }

7
src/Partition.cxx
View File

@ -52,6 +52,13 @@ Partition::Partition(Instance &_instance,
Partition::~Partition() noexcept = default; Partition::~Partition() noexcept = default;
void
Partition::BeginShutdown() noexcept
{
pc.Kill();
listener.reset();
}
void void
Partition::EmitIdle(unsigned mask) noexcept Partition::EmitIdle(unsigned mask) noexcept
{ {

2
src/Partition.hxx
View File

@ -74,6 +74,8 @@ struct Partition final : QueueListener, PlayerListener, MixerListener {
~Partition() noexcept; ~Partition() noexcept;
void BeginShutdown() noexcept;
void EmitGlobalEvent(unsigned mask) noexcept { void EmitGlobalEvent(unsigned mask) noexcept {
global_events.OrMask(mask); global_events.OrMask(mask);
} }