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

Util/Macros: replacement for GLib's G_N_ELEMENTS()

Browse Source
This commit is contained in:
Max Kellermann
2013-10-15 22:04:17 +02:00
parent 77429b6dd3
commit 509f8dab89
19 changed files with 100 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/pcm/PcmDsd.cxx
View File

@@ -20,8 +20,7 @@
#include "config.h"
#include "PcmDsd.hxx"
#include "dsd2pcm/dsd2pcm.h"
#include <glib.h>
#include "util/Macros.hxx"
#include <algorithm>
@@ -30,12 +29,12 @@
PcmDsd::PcmDsd()
{
std::fill_n(dsd2pcm, G_N_ELEMENTS(dsd2pcm), nullptr);
std::fill_n(dsd2pcm, ARRAY_SIZE(dsd2pcm), nullptr);
}
PcmDsd::~PcmDsd()
{
for (unsigned i = 0; i < G_N_ELEMENTS(dsd2pcm); ++i)
for (unsigned i = 0; i < ARRAY_SIZE(dsd2pcm); ++i)
if (dsd2pcm[i] != nullptr)
dsd2pcm_destroy(dsd2pcm[i]);
}
@@ -43,7 +42,7 @@ PcmDsd::~PcmDsd()
void
PcmDsd::Reset()
{
for (unsigned i = 0; i < G_N_ELEMENTS(dsd2pcm); ++i)
for (unsigned i = 0; i < ARRAY_SIZE(dsd2pcm); ++i)
if (dsd2pcm[i] != nullptr)
dsd2pcm_reset(dsd2pcm[i]);
}
@@ -56,7 +55,7 @@ PcmDsd::ToFloat(unsigned channels, bool lsbfirst,
assert(src != nullptr);
assert(src_size > 0);
assert(src_size % channels == 0);
assert(channels <= G_N_ELEMENTS(dsd2pcm));
assert(channels <= ARRAY_SIZE(dsd2pcm));
const unsigned num_samples = src_size;
const unsigned num_frames = src_size / channels;