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

lib/alsa/NonBlock: embed in "namespace Alsa"

Browse Source
This commit is contained in:
Max Kellermann 2024-07-11 21:31:04 +02:00
parent 9704cf3dcb
commit 3db8a4f41b
5 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/input/plugins/AlsaInputPlugin.cxx
View File

@ -62,7 +62,7 @@ class AlsaInputStream final
snd_pcm_t *capture_handle; snd_pcm_t *capture_handle;
const size_t frame_size; const size_t frame_size;
AlsaNonBlockPcm non_block; Alsa::NonBlockPcm non_block;
InjectEvent defer_invalidate_sockets; InjectEvent defer_invalidate_sockets;

14
src/lib/alsa/NonBlock.cxx
View File

@ -5,8 +5,10 @@
#include "Error.hxx" #include "Error.hxx"
#include "event/MultiSocketMonitor.hxx" #include "event/MultiSocketMonitor.hxx"
namespace Alsa {
Event::Duration Event::Duration
AlsaNonBlockPcm::PrepareSockets(MultiSocketMonitor &m, snd_pcm_t *pcm) NonBlockPcm::PrepareSockets(MultiSocketMonitor &m, snd_pcm_t *pcm)
{ {
int count = snd_pcm_poll_descriptors_count(pcm); int count = snd_pcm_poll_descriptors_count(pcm);
if (count <= 0) { if (count <= 0) {
@ -31,8 +33,7 @@ AlsaNonBlockPcm::PrepareSockets(MultiSocketMonitor &m, snd_pcm_t *pcm)
} }
void void
AlsaNonBlockPcm::DispatchSockets(MultiSocketMonitor &m, NonBlockPcm::DispatchSockets(MultiSocketMonitor &m, snd_pcm_t *pcm)
snd_pcm_t *pcm)
{ {
int count = snd_pcm_poll_descriptors_count(pcm); int count = snd_pcm_poll_descriptors_count(pcm);
if (count <= 0) if (count <= 0)
@ -57,7 +58,7 @@ AlsaNonBlockPcm::DispatchSockets(MultiSocketMonitor &m,
} }
Event::Duration Event::Duration
AlsaNonBlockMixer::PrepareSockets(MultiSocketMonitor &m, snd_mixer_t *mixer) noexcept NonBlockMixer::PrepareSockets(MultiSocketMonitor &m, snd_mixer_t *mixer) noexcept
{ {
int count = snd_mixer_poll_descriptors_count(mixer); int count = snd_mixer_poll_descriptors_count(mixer);
if (count <= 0) { if (count <= 0) {
@ -76,8 +77,7 @@ AlsaNonBlockMixer::PrepareSockets(MultiSocketMonitor &m, snd_mixer_t *mixer) noe
} }
void void
AlsaNonBlockMixer::DispatchSockets(MultiSocketMonitor &m, NonBlockMixer::DispatchSockets(MultiSocketMonitor &m, snd_mixer_t *mixer) noexcept
snd_mixer_t *mixer) noexcept
{ {
int count = snd_mixer_poll_descriptors_count(mixer); int count = snd_mixer_poll_descriptors_count(mixer);
if (count <= 0) if (count <= 0)
@ -98,3 +98,5 @@ AlsaNonBlockMixer::DispatchSockets(MultiSocketMonitor &m,
unsigned short dummy; unsigned short dummy;
snd_mixer_poll_descriptors_revents(mixer, pfds, i - pfds, &dummy); snd_mixer_poll_descriptors_revents(mixer, pfds, i - pfds, &dummy);
} }
} // namespace Alsa

8
src/lib/alsa/NonBlock.hxx
View File

@ -10,11 +10,13 @@
class MultiSocketMonitor; class MultiSocketMonitor;
namespace Alsa {
/** /**
* Helper class for #MultiSocketMonitor's virtual methods which * Helper class for #MultiSocketMonitor's virtual methods which
* manages the file descriptors for a #snd_pcm_t. * manages the file descriptors for a #snd_pcm_t.
*/ */
class AlsaNonBlockPcm { class NonBlockPcm {
ReusableArray<pollfd> pfd_buffer; ReusableArray<pollfd> pfd_buffer;
public: public:
@ -37,7 +39,7 @@ public:
* Helper class for #MultiSocketMonitor's virtual methods which * Helper class for #MultiSocketMonitor's virtual methods which
* manages the file descriptors for a #snd_mixer_t. * manages the file descriptors for a #snd_mixer_t.
*/ */
class AlsaNonBlockMixer { class NonBlockMixer {
ReusableArray<pollfd> pfd_buffer; ReusableArray<pollfd> pfd_buffer;
public: public:
@ -50,3 +52,5 @@ public:
*/ */
void DispatchSockets(MultiSocketMonitor &m, snd_mixer_t *mixer) noexcept; void DispatchSockets(MultiSocketMonitor &m, snd_mixer_t *mixer) noexcept;
}; };
} // namespace Alsa

2
src/mixer/plugins/AlsaMixerPlugin.cxx
View File

@ -29,7 +29,7 @@ class AlsaMixerMonitor final : MultiSocketMonitor {
snd_mixer_t *mixer; snd_mixer_t *mixer;
AlsaNonBlockMixer non_block; Alsa::NonBlockMixer non_block;
public: public:
AlsaMixerMonitor(EventLoop &_loop, snd_mixer_t *_mixer) noexcept AlsaMixerMonitor(EventLoop &_loop, snd_mixer_t *_mixer) noexcept

2
src/output/plugins/AlsaOutputPlugin.cxx
View File

@ -210,7 +210,7 @@ class AlsaOutput final
*/ */
std::byte *silence; std::byte *silence;
AlsaNonBlockPcm non_block; Alsa::NonBlockPcm non_block;
/** /**
* For copying data from OutputThread to IOThread. * For copying data from OutputThread to IOThread.