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

pcm/PcmDsd: manage Dsd2Pcm instances, not pointers

Browse Source
This commit is contained in:
Max Kellermann 2020-01-14 23:26:34 +01:00
parent 2073a2c1b0
commit becd81f771
2 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/pcm/PcmDsd.cxx
View File

@ -23,23 +23,11 @@
#include <assert.h> #include <assert.h>
PcmDsd::PcmDsd() noexcept
{
dsd2pcm.fill(nullptr);
}
PcmDsd::~PcmDsd() noexcept
{
for (auto i : dsd2pcm)
delete i;
}
void void
PcmDsd::Reset() noexcept PcmDsd::Reset() noexcept
{ {
for (auto i : dsd2pcm) for (auto &i : dsd2pcm)
if (i != nullptr) i.Reset();
i->Reset();
} }
ConstBuffer<float> ConstBuffer<float>
@ -56,12 +44,9 @@ PcmDsd::ToFloat(unsigned channels, ConstBuffer<uint8_t> src) noexcept
float *dest = buffer.GetT<float>(num_samples); float *dest = buffer.GetT<float>(num_samples);
for (unsigned c = 0; c < channels; ++c) { for (unsigned c = 0; c < channels; ++c) {
if (dsd2pcm[c] == nullptr) dsd2pcm[c].Translate(num_frames,
dsd2pcm[c] = new Dsd2Pcm(); src.data + c, channels,
dest + c, channels);
dsd2pcm[c]->Translate(num_frames,
src.data + c, channels,
dest + c, channels);
} }
return { dest, num_samples }; return { dest, num_samples };

7
src/pcm/PcmDsd.hxx
View File

@ -22,13 +22,13 @@
#include "Buffer.hxx" #include "Buffer.hxx"
#include "ChannelDefs.hxx" #include "ChannelDefs.hxx"
#include "Dsd2Pcm.hxx"
#include <array> #include <array>
#include <stdint.h> #include <stdint.h>
template<typename T> struct ConstBuffer; template<typename T> struct ConstBuffer;
class Dsd2Pcm;
/** /**
* Wrapper for the dsd2pcm library. * Wrapper for the dsd2pcm library.
@ -36,12 +36,9 @@ class Dsd2Pcm;
class PcmDsd { class PcmDsd {
PcmBuffer buffer; PcmBuffer buffer;
std::array<Dsd2Pcm *, MAX_CHANNELS> dsd2pcm; std::array<Dsd2Pcm, MAX_CHANNELS> dsd2pcm;
public: public:
PcmDsd() noexcept;
~PcmDsd() noexcept;
void Reset() noexcept; void Reset() noexcept;
ConstBuffer<float> ToFloat(unsigned channels, ConstBuffer<float> ToFloat(unsigned channels,