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

fix wrong emplace usage

Browse Source 
emplace already calls std::pair. No need for it again.

No need to emplace when calling std::make_shared.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2021-09-07 20:51:41 -07:00
parent 6ec5089cc9
commit 40483d8478
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/neighbor/plugins/UdisksNeighborPlugin.cxx
View File

@ -193,11 +193,11 @@ UdisksNeighborExplorer::Insert(UDisks2::Object &&o) noexcept
{ {
const std::lock_guard<Mutex> protect(mutex); const std::lock_guard<Mutex> protect(mutex);
auto i = by_uri.emplace(std::make_pair(o.GetUri(), info)); auto i = by_uri.emplace(o.GetUri(), info);
if (!i.second) if (!i.second)
i.first->second = info; i.first->second = info;
by_path.emplace(std::make_pair(o.path, i.first)); by_path.emplace(o.path, i.first);
// TODO: do we need to remove a conflicting path? // TODO: do we need to remove a conflicting path?
} }

5
src/output/MultipleOutputs.cxx
View File

@ -134,7 +134,7 @@ MultipleOutputs::Add(std::unique_ptr<FilteredAudioOutput> output,
bool enable) noexcept bool enable) noexcept
{ {
// TODO: this operation needs to be protected with a mutex // TODO: this operation needs to be protected with a mutex
outputs.emplace_back(std::make_unique<AudioOutputControl>(std::move(output), outputs.push_back(std::make_unique<AudioOutputControl>(std::move(output),
client)); client));
outputs.back()->LockSetEnabled(enable); outputs.back()->LockSetEnabled(enable);
@ -147,8 +147,7 @@ MultipleOutputs::AddCopy(AudioOutputControl *outputControl,
bool enable) noexcept bool enable) noexcept
{ {
// TODO: this operation needs to be protected with a mutex // TODO: this operation needs to be protected with a mutex
outputs.emplace_back(std::make_unique<AudioOutputControl>(outputControl, outputs.push_back(std::make_unique<AudioOutputControl>(outputControl, client));
client));
outputs.back()->LockSetEnabled(enable); outputs.back()->LockSetEnabled(enable);

2
src/output/plugins/snapcast/SnapcastOutputPlugin.cxx
View File

@ -346,7 +346,7 @@ SnapcastOutput::Play(const void *chunk, size_t size)
inject_event.Schedule(); inject_event.Schedule();
const ConstBuffer payload{buffer, nbytes}; const ConstBuffer payload{buffer, nbytes};
chunks.emplace(std::make_shared<SnapcastChunk>(now, AllocatedArray{payload})); chunks.push(std::make_shared<SnapcastChunk>(now, AllocatedArray{payload}));
} }
return size; return size;