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

mixer/alsa: use AllocatedArray for the pollfd buffer

Browse Source
This commit is contained in:
Max Kellermann 2013-08-07 18:55:00 +02:00
parent 953e3190ca
commit 123dd5fe2d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mixer/AlsaMixerPlugin.cxx
View File

@ -23,6 +23,7 @@
#include "GlobalEvents.hxx" #include "GlobalEvents.hxx"
#include "Main.hxx" #include "Main.hxx"
#include "event/MultiSocketMonitor.hxx" #include "event/MultiSocketMonitor.hxx"
#include "util/ReusableArray.hxx"
#include <algorithm> #include <algorithm>
@ -36,6 +37,8 @@ static constexpr unsigned VOLUME_MIXER_ALSA_INDEX_DEFAULT = 0;
class AlsaMixerMonitor final : private MultiSocketMonitor { class AlsaMixerMonitor final : private MultiSocketMonitor {
snd_mixer_t *const mixer; snd_mixer_t *const mixer;
ReusableArray<pollfd> pfd_buffer;
public: public:
AlsaMixerMonitor(EventLoop &_loop, snd_mixer_t *_mixer) AlsaMixerMonitor(EventLoop &_loop, snd_mixer_t *_mixer)
:MultiSocketMonitor(_loop), mixer(_mixer) {} :MultiSocketMonitor(_loop), mixer(_mixer) {}
@ -87,7 +90,8 @@ AlsaMixerMonitor::PrepareSockets(gcc_unused gint *timeout_r)
if (count < 0) if (count < 0)
count = 0; count = 0;
struct pollfd *pfds = g_new(struct pollfd, count); struct pollfd *pfds = pfd_buffer.Get(count);
count = snd_mixer_poll_descriptors(mixer, pfds, count); count = snd_mixer_poll_descriptors(mixer, pfds, count);
if (count < 0) if (count < 0)
count = 0; count = 0;
@ -109,8 +113,6 @@ AlsaMixerMonitor::PrepareSockets(gcc_unused gint *timeout_r)
for (auto i = pfds; i != end; ++i) for (auto i = pfds; i != end; ++i)
if (i->events != 0) if (i->events != 0)
AddSocket(i->fd, i->events); AddSocket(i->fd, i->events);
g_free(pfds);
} }
void void