Skip to content

M
mpd
Commit 39046bed authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

Instance: wrap ClientList in std::unique_ptr<>

parent 71a5c8b8
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
src/Instance.cxx
View file @ 39046bed
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include "Partition.hxx" #include "Partition.hxx"
#include "Idle.hxx" #include "Idle.hxx"
#include "Stats.hxx" #include "Stats.hxx"
#include "client/List.hxx"
#ifdef ENABLE_CURL #ifdef ENABLE_CURL
#include "RemoteTagCache.hxx" #include "RemoteTagCache.hxx"
......
src/Instance.hxx
View file @ 39046bed
...@@ -120,7 +120,7 @@ struct Instance final ...@@ -120,7 +120,7 @@ struct Instance final
std::unique_ptr<RemoteTagCache> remote_tag_cache; std::unique_ptr<RemoteTagCache> remote_tag_cache;
#endif #endif
ClientList *client_list; std::unique_ptr<ClientList> client_list;
std::list<Partition> partitions; std::list<Partition> partitions;
......
src/Main.cxx
View file @ 39046bed
...@@ -441,7 +441,7 @@ MainConfigured(const struct options &options, const ConfigData &raw_config) ...@@ -441,7 +441,7 @@ MainConfigured(const struct options &options, const ConfigData &raw_config)
const unsigned max_clients = const unsigned max_clients =
raw_config.GetPositive(ConfigOption::MAX_CONN, 10); raw_config.GetPositive(ConfigOption::MAX_CONN, 10);
instance.client_list = new ClientList(max_clients); instance.client_list = std::make_unique<ClientList>(max_clients);
initialize_decoder_and_player(instance, initialize_decoder_and_player(instance,
raw_config, config.replay_gain); raw_config, config.replay_gain);
...@@ -617,8 +617,6 @@ mpd_main_after_fork(Instance &instance, ...@@ -617,8 +617,6 @@ mpd_main_after_fork(Instance &instance,
ZeroconfDeinit(); ZeroconfDeinit();
instance.BeginShutdownPartitions(); instance.BeginShutdownPartitions();
delete instance.client_list;
} }
#ifdef ANDROID #ifdef ANDROID
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment