add draft ALSA input plugin
I've created an elementary input plugin that plays sound from the
soundcard, so you can use MPD to listen to anything connected to the
line-in jack, or to Video4Linux FM radio cards that send audio through
the soundcard. There has been a small number of posts here in the
past requesting line-in input, so here is a first, simplistic stab at
it.
The patch adds a new sheme, alsa://, which causes mpd to play data
read directly from a souncdard. It defaults to hw:0,0, but you can
pass any ALSA device name in the URI. So, using mpc for example:
mpc add alsa://
mpc play
will play from device hw:0,0.
To use a diffferent device:
mpc add alsa://hw:1,0
2013-12-15 17:52:21 +01:00
|
|
|
/*
|
2014-01-13 22:30:36 +01:00
|
|
|
* Copyright (C) 2003-2014 The Music Player Daemon Project
|
add draft ALSA input plugin
I've created an elementary input plugin that plays sound from the
soundcard, so you can use MPD to listen to anything connected to the
line-in jack, or to Video4Linux FM radio cards that send audio through
the soundcard. There has been a small number of posts here in the
past requesting line-in input, so here is a first, simplistic stab at
it.
The patch adds a new sheme, alsa://, which causes mpd to play data
read directly from a souncdard. It defaults to hw:0,0, but you can
pass any ALSA device name in the URI. So, using mpc for example:
mpc add alsa://
mpc play
will play from device hw:0,0.
To use a diffferent device:
mpc add alsa://hw:1,0
2013-12-15 17:52:21 +01:00
|
|
|
* http://www.musicpd.org
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License along
|
|
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* ALSA code based on an example by Paul Davis released under GPL here:
|
|
|
|
* http://equalarea.com/paul/alsa-audio.html
|
|
|
|
* and one by Matthias Nagorni, also GPL, here:
|
|
|
|
* http://alsamodular.sourceforge.net/alsa_programming_howto.html
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "config.h"
|
|
|
|
#include "AlsaInputPlugin.hxx"
|
2014-01-24 16:18:21 +01:00
|
|
|
#include "../InputPlugin.hxx"
|
|
|
|
#include "../InputStream.hxx"
|
add draft ALSA input plugin
I've created an elementary input plugin that plays sound from the
soundcard, so you can use MPD to listen to anything connected to the
line-in jack, or to Video4Linux FM radio cards that send audio through
the soundcard. There has been a small number of posts here in the
past requesting line-in input, so here is a first, simplistic stab at
it.
The patch adds a new sheme, alsa://, which causes mpd to play data
read directly from a souncdard. It defaults to hw:0,0, but you can
pass any ALSA device name in the URI. So, using mpc for example:
mpc add alsa://
mpc play
will play from device hw:0,0.
To use a diffferent device:
mpc add alsa://hw:1,0
2013-12-15 17:52:21 +01:00
|
|
|
#include "util/Domain.hxx"
|
|
|
|
#include "util/Error.hxx"
|
|
|
|
#include "util/StringUtil.hxx"
|
2014-01-02 18:54:18 +01:00
|
|
|
#include "util/ReusableArray.hxx"
|
2014-05-11 16:02:57 +02:00
|
|
|
|
add draft ALSA input plugin
I've created an elementary input plugin that plays sound from the
soundcard, so you can use MPD to listen to anything connected to the
line-in jack, or to Video4Linux FM radio cards that send audio through
the soundcard. There has been a small number of posts here in the
past requesting line-in input, so here is a first, simplistic stab at
it.
The patch adds a new sheme, alsa://, which causes mpd to play data
read directly from a souncdard. It defaults to hw:0,0, but you can
pass any ALSA device name in the URI. So, using mpc for example:
mpc add alsa://
mpc play
will play from device hw:0,0.
To use a diffferent device:
mpc add alsa://hw:1,0
2013-12-15 17:52:21 +01:00
|
|
|
#include "Log.hxx"
|
2014-01-02 18:54:18 +01:00
|
|
|
#include "event/MultiSocketMonitor.hxx"
|
|
|
|
#include "event/DeferredMonitor.hxx"
|
|
|
|
#include "event/Call.hxx"
|
|
|
|
#include "thread/Mutex.hxx"
|
|
|
|
#include "thread/Cond.hxx"
|
|
|
|
#include "IOThread.hxx"
|
add draft ALSA input plugin
I've created an elementary input plugin that plays sound from the
soundcard, so you can use MPD to listen to anything connected to the
line-in jack, or to Video4Linux FM radio cards that send audio through
the soundcard. There has been a small number of posts here in the
past requesting line-in input, so here is a first, simplistic stab at
it.
The patch adds a new sheme, alsa://, which causes mpd to play data
read directly from a souncdard. It defaults to hw:0,0, but you can
pass any ALSA device name in the URI. So, using mpc for example:
mpc add alsa://
mpc play
will play from device hw:0,0.
To use a diffferent device:
mpc add alsa://hw:1,0
2013-12-15 17:52:21 +01:00
|
|
|
|
|
|
|
#include <alsa/asoundlib.h>
|
|
|
|
|
2014-01-02 18:54:18 +01:00
|
|
|
#include <assert.h>
|
|
|
|
#include <string.h>
|
|
|
|
|
add draft ALSA input plugin
I've created an elementary input plugin that plays sound from the
soundcard, so you can use MPD to listen to anything connected to the
line-in jack, or to Video4Linux FM radio cards that send audio through
the soundcard. There has been a small number of posts here in the
past requesting line-in input, so here is a first, simplistic stab at
it.
The patch adds a new sheme, alsa://, which causes mpd to play data
read directly from a souncdard. It defaults to hw:0,0, but you can
pass any ALSA device name in the URI. So, using mpc for example:
mpc add alsa://
mpc play
will play from device hw:0,0.
To use a diffferent device:
mpc add alsa://hw:1,0
2013-12-15 17:52:21 +01:00
|
|
|
static constexpr Domain alsa_input_domain("alsa");
|
|
|
|
|
|
|
|
static constexpr const char *default_device = "hw:0,0";
|
|
|
|
|
|
|
|
// the following defaults are because the PcmDecoderPlugin forces CD format
|
|
|
|
static constexpr snd_pcm_format_t default_format = SND_PCM_FORMAT_S16;
|
|
|
|
static constexpr int default_channels = 2; // stereo
|
|
|
|
static constexpr unsigned int default_rate = 44100; // cd quality
|
|
|
|
|
2014-01-02 18:54:18 +01:00
|
|
|
/**
|
|
|
|
* This value should be the same as the read buffer size defined in
|
|
|
|
* PcmDecoderPlugin.cxx:pcm_stream_decode().
|
|
|
|
* We use it to calculate how many audio frames to buffer in the alsa driver
|
|
|
|
* before reading from the device. snd_pcm_readi() blocks until that many
|
|
|
|
* frames are ready.
|
|
|
|
*/
|
|
|
|
static constexpr size_t read_buffer_size = 4096;
|
|
|
|
|
2014-05-11 16:02:57 +02:00
|
|
|
class AlsaInputStream final
|
|
|
|
: public InputStream,
|
|
|
|
MultiSocketMonitor, DeferredMonitor {
|
add draft ALSA input plugin
I've created an elementary input plugin that plays sound from the
soundcard, so you can use MPD to listen to anything connected to the
line-in jack, or to Video4Linux FM radio cards that send audio through
the soundcard. There has been a small number of posts here in the
past requesting line-in input, so here is a first, simplistic stab at
it.
The patch adds a new sheme, alsa://, which causes mpd to play data
read directly from a souncdard. It defaults to hw:0,0, but you can
pass any ALSA device name in the URI. So, using mpc for example:
mpc add alsa://
mpc play
will play from device hw:0,0.
To use a diffferent device:
mpc add alsa://hw:1,0
2013-12-15 17:52:21 +01:00
|
|
|
snd_pcm_t *capture_handle;
|
|
|
|
size_t frame_size;
|
2014-01-02 18:54:18 +01:00
|
|
|
int frames_to_read;
|
|
|
|
bool eof;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Is somebody waiting for data? This is set by method
|
|
|
|
* Available().
|
|
|
|
*/
|
|
|
|
std::atomic_bool waiting;
|
|
|
|
|
|
|
|
ReusableArray<pollfd> pfd_buffer;
|
|
|
|
|
|
|
|
public:
|
|
|
|
AlsaInputStream(EventLoop &loop,
|
2014-05-11 16:02:57 +02:00
|
|
|
const char *_uri, Mutex &_mutex, Cond &_cond,
|
2014-01-02 18:54:18 +01:00
|
|
|
snd_pcm_t *_handle, int _frame_size)
|
2014-05-11 16:02:57 +02:00
|
|
|
:InputStream(input_plugin_alsa, _uri, _mutex, _cond),
|
|
|
|
MultiSocketMonitor(loop),
|
2014-01-02 18:54:18 +01:00
|
|
|
DeferredMonitor(loop),
|
|
|
|
capture_handle(_handle),
|
|
|
|
frame_size(_frame_size),
|
|
|
|
eof(false)
|
|
|
|
{
|
2014-05-11 16:02:57 +02:00
|
|
|
assert(_uri != nullptr);
|
2014-01-02 18:54:18 +01:00
|
|
|
assert(_handle != nullptr);
|
|
|
|
|
|
|
|
/* this mime type forces use of the PcmDecoderPlugin.
|
|
|
|
Needs to be generalised when/if that decoder is
|
|
|
|
updated to support other audio formats */
|
2014-05-11 16:02:57 +02:00
|
|
|
SetMimeType("audio/x-mpd-cdda-pcm");
|
|
|
|
InputStream::SetReady();
|
2014-05-11 15:34:48 +02:00
|
|
|
|
2014-01-02 18:54:18 +01:00
|
|
|
frames_to_read = read_buffer_size / frame_size;
|
|
|
|
|
|
|
|
snd_pcm_start(capture_handle);
|
|
|
|
|
|
|
|
DeferredMonitor::Schedule();
|
add draft ALSA input plugin
I've created an elementary input plugin that plays sound from the
soundcard, so you can use MPD to listen to anything connected to the
line-in jack, or to Video4Linux FM radio cards that send audio through
the soundcard. There has been a small number of posts here in the
past requesting line-in input, so here is a first, simplistic stab at
it.
The patch adds a new sheme, alsa://, which causes mpd to play data
read directly from a souncdard. It defaults to hw:0,0, but you can
pass any ALSA device name in the URI. So, using mpc for example:
mpc add alsa://
mpc play
will play from device hw:0,0.
To use a diffferent device:
mpc add alsa://hw:1,0
2013-12-15 17:52:21 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
~AlsaInputStream() {
|
|
|
|
snd_pcm_close(capture_handle);
|
|
|
|
}
|
2014-01-02 18:54:18 +01:00
|
|
|
|
|
|
|
using DeferredMonitor::GetEventLoop;
|
|
|
|
|
|
|
|
static InputStream *Create(const char *uri, Mutex &mutex, Cond &cond,
|
|
|
|
Error &error);
|
|
|
|
|
2014-05-11 17:14:49 +02:00
|
|
|
/* virtual methods from InputStream */
|
|
|
|
|
|
|
|
bool IsEOF() override {
|
|
|
|
return eof;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool IsAvailable() override {
|
2014-01-02 18:54:18 +01:00
|
|
|
if (snd_pcm_avail(capture_handle) > frames_to_read)
|
|
|
|
return true;
|
|
|
|
|
|
|
|
if (!waiting.exchange(true))
|
|
|
|
SafeInvalidateSockets();
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2014-05-11 17:14:49 +02:00
|
|
|
size_t Read(void *ptr, size_t size, Error &error) override;
|
2014-01-02 18:54:18 +01:00
|
|
|
|
|
|
|
private:
|
|
|
|
static snd_pcm_t *OpenDevice(const char *device, int rate,
|
|
|
|
snd_pcm_format_t format, int channels,
|
|
|
|
Error &error);
|
|
|
|
|
|
|
|
int Recover(int err);
|
|
|
|
|
|
|
|
void SafeInvalidateSockets() {
|
|
|
|
DeferredMonitor::Schedule();
|
|
|
|
}
|
|
|
|
|
|
|
|
virtual void RunDeferred() override {
|
|
|
|
InvalidateSockets();
|
|
|
|
}
|
|
|
|
|
|
|
|
virtual int PrepareSockets() override;
|
|
|
|
virtual void DispatchSockets() override;
|
add draft ALSA input plugin
I've created an elementary input plugin that plays sound from the
soundcard, so you can use MPD to listen to anything connected to the
line-in jack, or to Video4Linux FM radio cards that send audio through
the soundcard. There has been a small number of posts here in the
past requesting line-in input, so here is a first, simplistic stab at
it.
The patch adds a new sheme, alsa://, which causes mpd to play data
read directly from a souncdard. It defaults to hw:0,0, but you can
pass any ALSA device name in the URI. So, using mpc for example:
mpc add alsa://
mpc play
will play from device hw:0,0.
To use a diffferent device:
mpc add alsa://hw:1,0
2013-12-15 17:52:21 +01:00
|
|
|
};
|
|
|
|
|
2014-01-02 18:54:18 +01:00
|
|
|
inline InputStream *
|
|
|
|
AlsaInputStream::Create(const char *uri, Mutex &mutex, Cond &cond,
|
|
|
|
Error &error)
|
add draft ALSA input plugin
I've created an elementary input plugin that plays sound from the
soundcard, so you can use MPD to listen to anything connected to the
line-in jack, or to Video4Linux FM radio cards that send audio through
the soundcard. There has been a small number of posts here in the
past requesting line-in input, so here is a first, simplistic stab at
it.
The patch adds a new sheme, alsa://, which causes mpd to play data
read directly from a souncdard. It defaults to hw:0,0, but you can
pass any ALSA device name in the URI. So, using mpc for example:
mpc add alsa://
mpc play
will play from device hw:0,0.
To use a diffferent device:
mpc add alsa://hw:1,0
2013-12-15 17:52:21 +01:00
|
|
|
{
|
2014-01-02 18:54:18 +01:00
|
|
|
const char *const scheme = "alsa://";
|
|
|
|
if (!StringStartsWith(uri, scheme))
|
add draft ALSA input plugin
I've created an elementary input plugin that plays sound from the
soundcard, so you can use MPD to listen to anything connected to the
line-in jack, or to Video4Linux FM radio cards that send audio through
the soundcard. There has been a small number of posts here in the
past requesting line-in input, so here is a first, simplistic stab at
it.
The patch adds a new sheme, alsa://, which causes mpd to play data
read directly from a souncdard. It defaults to hw:0,0, but you can
pass any ALSA device name in the URI. So, using mpc for example:
mpc add alsa://
mpc play
will play from device hw:0,0.
To use a diffferent device:
mpc add alsa://hw:1,0
2013-12-15 17:52:21 +01:00
|
|
|
return nullptr;
|
|
|
|
|
2014-01-02 18:54:18 +01:00
|
|
|
const char *device = uri + strlen(scheme);
|
|
|
|
if (strlen(device) == 0)
|
add draft ALSA input plugin
I've created an elementary input plugin that plays sound from the
soundcard, so you can use MPD to listen to anything connected to the
line-in jack, or to Video4Linux FM radio cards that send audio through
the soundcard. There has been a small number of posts here in the
past requesting line-in input, so here is a first, simplistic stab at
it.
The patch adds a new sheme, alsa://, which causes mpd to play data
read directly from a souncdard. It defaults to hw:0,0, but you can
pass any ALSA device name in the URI. So, using mpc for example:
mpc add alsa://
mpc play
will play from device hw:0,0.
To use a diffferent device:
mpc add alsa://hw:1,0
2013-12-15 17:52:21 +01:00
|
|
|
device = default_device;
|
|
|
|
|
2014-01-02 18:54:18 +01:00
|
|
|
/* placeholders - eventually user-requested audio format will
|
|
|
|
be passed via the URI. For now we just force the
|
|
|
|
defaults */
|
|
|
|
int rate = default_rate;
|
|
|
|
snd_pcm_format_t format = default_format;
|
|
|
|
int channels = default_channels;
|
|
|
|
|
|
|
|
snd_pcm_t *handle = OpenDevice(device, rate, format, channels,
|
|
|
|
error);
|
|
|
|
if (handle == nullptr)
|
|
|
|
return nullptr;
|
|
|
|
|
|
|
|
int frame_size = snd_pcm_format_width(format) / 8 * channels;
|
2014-05-11 16:02:57 +02:00
|
|
|
return new AlsaInputStream(io_thread_get(),
|
|
|
|
uri, mutex, cond,
|
|
|
|
handle, frame_size);
|
2014-01-02 18:54:18 +01:00
|
|
|
}
|
|
|
|
|
2014-05-11 17:14:49 +02:00
|
|
|
size_t
|
2014-05-11 16:02:57 +02:00
|
|
|
AlsaInputStream::Read(void *ptr, size_t read_size, Error &error)
|
2014-01-02 18:54:18 +01:00
|
|
|
{
|
|
|
|
assert(ptr != nullptr);
|
|
|
|
|
2014-05-11 16:02:57 +02:00
|
|
|
int num_frames = read_size / frame_size;
|
2014-01-02 18:54:18 +01:00
|
|
|
int ret;
|
|
|
|
while ((ret = snd_pcm_readi(capture_handle, ptr, num_frames)) < 0) {
|
|
|
|
if (Recover(ret) < 0) {
|
|
|
|
eof = true;
|
|
|
|
error.Format(alsa_input_domain,
|
|
|
|
"PCM error - stream aborted");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
size_t nbytes = ret * frame_size;
|
2014-05-11 16:02:57 +02:00
|
|
|
offset += nbytes;
|
2014-01-02 18:54:18 +01:00
|
|
|
return nbytes;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
AlsaInputStream::PrepareSockets()
|
|
|
|
{
|
|
|
|
if (!waiting) {
|
|
|
|
ClearSocketList();
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
int count = snd_pcm_poll_descriptors_count(capture_handle);
|
|
|
|
if (count < 0) {
|
|
|
|
ClearSocketList();
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct pollfd *pfds = pfd_buffer.Get(count);
|
|
|
|
|
|
|
|
count = snd_pcm_poll_descriptors(capture_handle, pfds, count);
|
|
|
|
if (count < 0)
|
|
|
|
count = 0;
|
|
|
|
|
|
|
|
ReplaceSocketList(pfds, count);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
AlsaInputStream::DispatchSockets()
|
|
|
|
{
|
|
|
|
waiting = false;
|
|
|
|
|
2014-05-11 16:02:57 +02:00
|
|
|
const ScopeLock protect(mutex);
|
2014-01-02 18:54:18 +01:00
|
|
|
/* wake up the thread that is waiting for more data */
|
2014-05-11 16:02:57 +02:00
|
|
|
cond.broadcast();
|
2014-01-02 18:54:18 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
inline int
|
|
|
|
AlsaInputStream::Recover(int err)
|
|
|
|
{
|
|
|
|
switch(err) {
|
|
|
|
case -EPIPE:
|
|
|
|
LogDebug(alsa_input_domain, "Buffer Overrun");
|
|
|
|
// drop through
|
|
|
|
case -ESTRPIPE:
|
|
|
|
case -EINTR:
|
|
|
|
err = snd_pcm_recover(capture_handle, err, 1);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
// something broken somewhere, give up
|
|
|
|
err = -1;
|
|
|
|
}
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
inline snd_pcm_t *
|
|
|
|
AlsaInputStream::OpenDevice(const char *device,
|
|
|
|
int rate, snd_pcm_format_t format, int channels,
|
|
|
|
Error &error)
|
|
|
|
{
|
add draft ALSA input plugin
I've created an elementary input plugin that plays sound from the
soundcard, so you can use MPD to listen to anything connected to the
line-in jack, or to Video4Linux FM radio cards that send audio through
the soundcard. There has been a small number of posts here in the
past requesting line-in input, so here is a first, simplistic stab at
it.
The patch adds a new sheme, alsa://, which causes mpd to play data
read directly from a souncdard. It defaults to hw:0,0, but you can
pass any ALSA device name in the URI. So, using mpc for example:
mpc add alsa://
mpc play
will play from device hw:0,0.
To use a diffferent device:
mpc add alsa://hw:1,0
2013-12-15 17:52:21 +01:00
|
|
|
snd_pcm_t *capture_handle;
|
2014-01-02 18:54:18 +01:00
|
|
|
int err;
|
add draft ALSA input plugin
I've created an elementary input plugin that plays sound from the
soundcard, so you can use MPD to listen to anything connected to the
line-in jack, or to Video4Linux FM radio cards that send audio through
the soundcard. There has been a small number of posts here in the
past requesting line-in input, so here is a first, simplistic stab at
it.
The patch adds a new sheme, alsa://, which causes mpd to play data
read directly from a souncdard. It defaults to hw:0,0, but you can
pass any ALSA device name in the URI. So, using mpc for example:
mpc add alsa://
mpc play
will play from device hw:0,0.
To use a diffferent device:
mpc add alsa://hw:1,0
2013-12-15 17:52:21 +01:00
|
|
|
if ((err = snd_pcm_open(&capture_handle, device,
|
|
|
|
SND_PCM_STREAM_CAPTURE, 0)) < 0) {
|
|
|
|
error.Format(alsa_input_domain, "Failed to open device: %s (%s)", device, snd_strerror(err));
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
snd_pcm_hw_params_t *hw_params;
|
|
|
|
if ((err = snd_pcm_hw_params_malloc(&hw_params)) < 0) {
|
|
|
|
error.Format(alsa_input_domain, "Cannot allocate hardware parameter structure (%s)", snd_strerror(err));
|
|
|
|
snd_pcm_close(capture_handle);
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((err = snd_pcm_hw_params_any(capture_handle, hw_params)) < 0) {
|
|
|
|
error.Format(alsa_input_domain, "Cannot initialize hardware parameter structure (%s)", snd_strerror(err));
|
|
|
|
snd_pcm_hw_params_free(hw_params);
|
|
|
|
snd_pcm_close(capture_handle);
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((err = snd_pcm_hw_params_set_access(capture_handle, hw_params, SND_PCM_ACCESS_RW_INTERLEAVED)) < 0) {
|
|
|
|
error.Format(alsa_input_domain, "Cannot set access type (%s)", snd_strerror (err));
|
2014-01-02 18:54:18 +01:00
|
|
|
snd_pcm_hw_params_free(hw_params);
|
add draft ALSA input plugin
I've created an elementary input plugin that plays sound from the
soundcard, so you can use MPD to listen to anything connected to the
line-in jack, or to Video4Linux FM radio cards that send audio through
the soundcard. There has been a small number of posts here in the
past requesting line-in input, so here is a first, simplistic stab at
it.
The patch adds a new sheme, alsa://, which causes mpd to play data
read directly from a souncdard. It defaults to hw:0,0, but you can
pass any ALSA device name in the URI. So, using mpc for example:
mpc add alsa://
mpc play
will play from device hw:0,0.
To use a diffferent device:
mpc add alsa://hw:1,0
2013-12-15 17:52:21 +01:00
|
|
|
snd_pcm_close(capture_handle);
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
2014-01-02 18:54:18 +01:00
|
|
|
if ((err = snd_pcm_hw_params_set_format(capture_handle, hw_params, format)) < 0) {
|
add draft ALSA input plugin
I've created an elementary input plugin that plays sound from the
soundcard, so you can use MPD to listen to anything connected to the
line-in jack, or to Video4Linux FM radio cards that send audio through
the soundcard. There has been a small number of posts here in the
past requesting line-in input, so here is a first, simplistic stab at
it.
The patch adds a new sheme, alsa://, which causes mpd to play data
read directly from a souncdard. It defaults to hw:0,0, but you can
pass any ALSA device name in the URI. So, using mpc for example:
mpc add alsa://
mpc play
will play from device hw:0,0.
To use a diffferent device:
mpc add alsa://hw:1,0
2013-12-15 17:52:21 +01:00
|
|
|
snd_pcm_hw_params_free(hw_params);
|
|
|
|
snd_pcm_close(capture_handle);
|
|
|
|
error.Format(alsa_input_domain, "Cannot set sample format (%s)", snd_strerror (err));
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
2014-01-02 18:54:18 +01:00
|
|
|
if ((err = snd_pcm_hw_params_set_channels(capture_handle, hw_params, channels)) < 0) {
|
add draft ALSA input plugin
I've created an elementary input plugin that plays sound from the
soundcard, so you can use MPD to listen to anything connected to the
line-in jack, or to Video4Linux FM radio cards that send audio through
the soundcard. There has been a small number of posts here in the
past requesting line-in input, so here is a first, simplistic stab at
it.
The patch adds a new sheme, alsa://, which causes mpd to play data
read directly from a souncdard. It defaults to hw:0,0, but you can
pass any ALSA device name in the URI. So, using mpc for example:
mpc add alsa://
mpc play
will play from device hw:0,0.
To use a diffferent device:
mpc add alsa://hw:1,0
2013-12-15 17:52:21 +01:00
|
|
|
snd_pcm_hw_params_free(hw_params);
|
|
|
|
snd_pcm_close(capture_handle);
|
|
|
|
error.Format(alsa_input_domain, "Cannot set channels (%s)", snd_strerror (err));
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
2014-01-02 18:54:18 +01:00
|
|
|
if ((err = snd_pcm_hw_params_set_rate(capture_handle, hw_params, rate, 0)) < 0) {
|
add draft ALSA input plugin
I've created an elementary input plugin that plays sound from the
soundcard, so you can use MPD to listen to anything connected to the
line-in jack, or to Video4Linux FM radio cards that send audio through
the soundcard. There has been a small number of posts here in the
past requesting line-in input, so here is a first, simplistic stab at
it.
The patch adds a new sheme, alsa://, which causes mpd to play data
read directly from a souncdard. It defaults to hw:0,0, but you can
pass any ALSA device name in the URI. So, using mpc for example:
mpc add alsa://
mpc play
will play from device hw:0,0.
To use a diffferent device:
mpc add alsa://hw:1,0
2013-12-15 17:52:21 +01:00
|
|
|
snd_pcm_hw_params_free(hw_params);
|
|
|
|
snd_pcm_close(capture_handle);
|
|
|
|
error.Format(alsa_input_domain, "Cannot set sample rate (%s)", snd_strerror (err));
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
2014-01-02 18:54:18 +01:00
|
|
|
/* period needs to be big enough so that poll() doesn't fire too often,
|
|
|
|
* but small enough that buffer overruns don't occur if Read() is not
|
|
|
|
* invoked often enough.
|
|
|
|
* the calculation here is empirical; however all measurements were
|
|
|
|
* done using 44100:16:2. When we extend this plugin to support
|
|
|
|
* other audio formats then this may need to be revisited */
|
|
|
|
snd_pcm_uframes_t period = read_buffer_size * 2;
|
|
|
|
int direction = -1;
|
|
|
|
if ((err = snd_pcm_hw_params_set_period_size_near(capture_handle, hw_params,
|
|
|
|
&period, &direction)) < 0) {
|
|
|
|
error.Format(alsa_input_domain, "Cannot set period size (%s)",
|
|
|
|
snd_strerror(err));
|
|
|
|
snd_pcm_hw_params_free(hw_params);
|
|
|
|
snd_pcm_close(capture_handle);
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
add draft ALSA input plugin
I've created an elementary input plugin that plays sound from the
soundcard, so you can use MPD to listen to anything connected to the
line-in jack, or to Video4Linux FM radio cards that send audio through
the soundcard. There has been a small number of posts here in the
past requesting line-in input, so here is a first, simplistic stab at
it.
The patch adds a new sheme, alsa://, which causes mpd to play data
read directly from a souncdard. It defaults to hw:0,0, but you can
pass any ALSA device name in the URI. So, using mpc for example:
mpc add alsa://
mpc play
will play from device hw:0,0.
To use a diffferent device:
mpc add alsa://hw:1,0
2013-12-15 17:52:21 +01:00
|
|
|
if ((err = snd_pcm_hw_params(capture_handle, hw_params)) < 0) {
|
2014-01-02 18:54:18 +01:00
|
|
|
error.Format(alsa_input_domain, "Cannot set parameters (%s)",
|
|
|
|
snd_strerror(err));
|
add draft ALSA input plugin
I've created an elementary input plugin that plays sound from the
soundcard, so you can use MPD to listen to anything connected to the
line-in jack, or to Video4Linux FM radio cards that send audio through
the soundcard. There has been a small number of posts here in the
past requesting line-in input, so here is a first, simplistic stab at
it.
The patch adds a new sheme, alsa://, which causes mpd to play data
read directly from a souncdard. It defaults to hw:0,0, but you can
pass any ALSA device name in the URI. So, using mpc for example:
mpc add alsa://
mpc play
will play from device hw:0,0.
To use a diffferent device:
mpc add alsa://hw:1,0
2013-12-15 17:52:21 +01:00
|
|
|
snd_pcm_hw_params_free(hw_params);
|
|
|
|
snd_pcm_close(capture_handle);
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
snd_pcm_hw_params_free (hw_params);
|
|
|
|
|
2014-01-02 18:54:18 +01:00
|
|
|
snd_pcm_sw_params_t *sw_params;
|
|
|
|
|
|
|
|
snd_pcm_sw_params_malloc(&sw_params);
|
|
|
|
snd_pcm_sw_params_current(capture_handle, sw_params);
|
|
|
|
|
|
|
|
if ((err = snd_pcm_sw_params_set_start_threshold(capture_handle, sw_params,
|
|
|
|
period)) < 0) {
|
|
|
|
error.Format(alsa_input_domain,
|
|
|
|
"unable to set start threshold (%s)", snd_strerror(err));
|
|
|
|
snd_pcm_sw_params_free(sw_params);
|
|
|
|
snd_pcm_close(capture_handle);
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((err = snd_pcm_sw_params(capture_handle, sw_params)) < 0) {
|
|
|
|
error.Format(alsa_input_domain,
|
|
|
|
"unable to install sw params (%s)", snd_strerror(err));
|
|
|
|
snd_pcm_sw_params_free(sw_params);
|
|
|
|
snd_pcm_close(capture_handle);
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
snd_pcm_sw_params_free(sw_params);
|
|
|
|
|
|
|
|
snd_pcm_prepare(capture_handle);
|
|
|
|
|
|
|
|
return capture_handle;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*######################### Plugin Functions ##############################*/
|
|
|
|
|
|
|
|
static InputStream *
|
|
|
|
alsa_input_open(const char *uri, Mutex &mutex, Cond &cond, Error &error)
|
|
|
|
{
|
|
|
|
return AlsaInputStream::Create(uri, mutex, cond, error);
|
add draft ALSA input plugin
I've created an elementary input plugin that plays sound from the
soundcard, so you can use MPD to listen to anything connected to the
line-in jack, or to Video4Linux FM radio cards that send audio through
the soundcard. There has been a small number of posts here in the
past requesting line-in input, so here is a first, simplistic stab at
it.
The patch adds a new sheme, alsa://, which causes mpd to play data
read directly from a souncdard. It defaults to hw:0,0, but you can
pass any ALSA device name in the URI. So, using mpc for example:
mpc add alsa://
mpc play
will play from device hw:0,0.
To use a diffferent device:
mpc add alsa://hw:1,0
2013-12-15 17:52:21 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
const struct InputPlugin input_plugin_alsa = {
|
2013-12-21 21:21:11 +01:00
|
|
|
"alsa",
|
|
|
|
nullptr,
|
|
|
|
nullptr,
|
|
|
|
alsa_input_open,
|
add draft ALSA input plugin
I've created an elementary input plugin that plays sound from the
soundcard, so you can use MPD to listen to anything connected to the
line-in jack, or to Video4Linux FM radio cards that send audio through
the soundcard. There has been a small number of posts here in the
past requesting line-in input, so here is a first, simplistic stab at
it.
The patch adds a new sheme, alsa://, which causes mpd to play data
read directly from a souncdard. It defaults to hw:0,0, but you can
pass any ALSA device name in the URI. So, using mpc for example:
mpc add alsa://
mpc play
will play from device hw:0,0.
To use a diffferent device:
mpc add alsa://hw:1,0
2013-12-15 17:52:21 +01:00
|
|
|
};
|