output/pulse: move code into the struct
This commit is contained in:
Max Kellermann
parent
0b9f650fe2
commit
970e338847
|
|
@ -30,7 +30,7 @@
|
|||
#include <stdio.h>
|
||||
|
||||
class PipeOutput {
|
||||
friend AudioOutputWrapper<PipeOutput>;
|
||||
friend struct AudioOutputWrapper<PipeOutput>;
|
||||
|
||||
AudioOutput base;
|
||||
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@
|
|||
#include "lib/pulse/Error.hxx"
|
||||
#include "lib/pulse/LogError.hxx"
|
||||
#include "../OutputAPI.hxx"
|
||||
#include "../Wrapper.hxx"
|
||||
#include "mixer/MixerList.hxx"
|
||||
#include "mixer/plugins/PulseMixerPlugin.hxx"
|
||||
#include "util/Error.hxx"
|
||||
|
|
@ -60,6 +61,85 @@ struct PulseOutput {
|
|||
:base(pulse_output_plugin),
|
||||
mixer(nullptr),
|
||||
mainloop(nullptr), stream(nullptr) {}
|
||||
|
||||
gcc_const
|
||||
static bool TestDefaultDevice();
|
||||
|
||||
bool Configure(const config_param ¶m, Error &error);
|
||||
|
||||
bool Enable(Error &error);
|
||||
void Disable();
|
||||
|
||||
bool Open(AudioFormat &audio_format, Error &error);
|
||||
void Close();
|
||||
|
||||
unsigned Delay();
|
||||
size_t Play(const void *chunk, size_t size, Error &error);
|
||||
void Cancel();
|
||||
bool Pause();
|
||||
|
||||
private:
|
||||
/**
|
||||
* Attempt to connect asynchronously to the PulseAudio server.
|
||||
*
|
||||
* @return true on success, false on error
|
||||
*/
|
||||
bool Connect(Error &error);
|
||||
|
||||
/**
|
||||
* Create, set up and connect a context.
|
||||
*
|
||||
* Caller must lock the main loop.
|
||||
*
|
||||
* @return true on success, false on error
|
||||
*/
|
||||
bool SetupContext(Error &error);
|
||||
|
||||
/**
|
||||
* Frees and clears the context.
|
||||
*
|
||||
* Caller must lock the main loop.
|
||||
*/
|
||||
void DeleteContext();
|
||||
|
||||
/**
|
||||
* Check if the context is (already) connected, and waits if
|
||||
* not. If the context has been disconnected, retry to
|
||||
* connect.
|
||||
*
|
||||
* Caller must lock the main loop.
|
||||
*
|
||||
* @return true on success, false on error
|
||||
*/
|
||||
bool WaitConnection(Error &error);
|
||||
|
||||
/**
|
||||
* Create, set up and connect a context.
|
||||
*
|
||||
* Caller must lock the main loop.
|
||||
*
|
||||
* @return true on success, false on error
|
||||
*/
|
||||
bool SetupStream(const pa_sample_spec &ss, Error &error);
|
||||
|
||||
/**
|
||||
* Frees and clears the stream.
|
||||
*/
|
||||
void DeleteStream();
|
||||
|
||||
/**
|
||||
* Check if the stream is (already) connected, and waits if
|
||||
* not. The mainloop must be locked before calling this
|
||||
* function.
|
||||
*
|
||||
* @return true on success, false on error
|
||||
*/
|
||||
bool WaitStream(Error &error);
|
||||
|
||||
/**
|
||||
* Sets cork mode on the stream.
|
||||
*/
|
||||
bool StreamPause(bool pause, Error &error);
|
||||
};
|
||||
|
||||
void
|
||||
|
|
@ -220,20 +300,14 @@ pulse_output_subscribe_cb(pa_context *context,
|
|||
pulse_mixer_on_change(*po->mixer, context, po->stream);
|
||||
}
|
||||
|
||||
/**
|
||||
* Attempt to connect asynchronously to the PulseAudio server.
|
||||
*
|
||||
* @return true on success, false on error
|
||||
*/
|
||||
static bool
|
||||
pulse_output_connect(PulseOutput *po, Error &error)
|
||||
inline bool
|
||||
PulseOutput::Connect(Error &error)
|
||||
{
|
||||
assert(po != nullptr);
|
||||
assert(po->context != nullptr);
|
||||
assert(context != nullptr);
|
||||
|
||||
if (pa_context_connect(po->context, po->server,
|
||||
if (pa_context_connect(context, server,
|
||||
(pa_context_flags_t)0, nullptr) < 0) {
|
||||
SetPulseError(error, po->context,
|
||||
SetPulseError(error, context,
|
||||
"pa_context_connect() has failed");
|
||||
return false;
|
||||
}
|
||||
|
|
@ -241,77 +315,72 @@ pulse_output_connect(PulseOutput *po, Error &error)
|
|||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Frees and clears the stream.
|
||||
*/
|
||||
static void
|
||||
pulse_output_delete_stream(PulseOutput *po)
|
||||
void
|
||||
PulseOutput::DeleteStream()
|
||||
{
|
||||
assert(po != nullptr);
|
||||
assert(po->stream != nullptr);
|
||||
assert(stream != nullptr);
|
||||
|
||||
pa_stream_set_suspended_callback(po->stream, nullptr, nullptr);
|
||||
pa_stream_set_suspended_callback(stream, nullptr, nullptr);
|
||||
|
||||
pa_stream_set_state_callback(po->stream, nullptr, nullptr);
|
||||
pa_stream_set_write_callback(po->stream, nullptr, nullptr);
|
||||
pa_stream_set_state_callback(stream, nullptr, nullptr);
|
||||
pa_stream_set_write_callback(stream, nullptr, nullptr);
|
||||
|
||||
pa_stream_disconnect(po->stream);
|
||||
pa_stream_unref(po->stream);
|
||||
po->stream = nullptr;
|
||||
pa_stream_disconnect(stream);
|
||||
pa_stream_unref(stream);
|
||||
stream = nullptr;
|
||||
}
|
||||
|
||||
/**
|
||||
* Frees and clears the context.
|
||||
*
|
||||
* Caller must lock the main loop.
|
||||
*/
|
||||
static void
|
||||
pulse_output_delete_context(PulseOutput *po)
|
||||
void
|
||||
PulseOutput::DeleteContext()
|
||||
{
|
||||
assert(po != nullptr);
|
||||
assert(po->context != nullptr);
|
||||
assert(context != nullptr);
|
||||
|
||||
pa_context_set_state_callback(po->context, nullptr, nullptr);
|
||||
pa_context_set_subscribe_callback(po->context, nullptr, nullptr);
|
||||
pa_context_set_state_callback(context, nullptr, nullptr);
|
||||
pa_context_set_subscribe_callback(context, nullptr, nullptr);
|
||||
|
||||
pa_context_disconnect(po->context);
|
||||
pa_context_unref(po->context);
|
||||
po->context = nullptr;
|
||||
pa_context_disconnect(context);
|
||||
pa_context_unref(context);
|
||||
context = nullptr;
|
||||
}
|
||||
|
||||
/**
|
||||
* Create, set up and connect a context.
|
||||
*
|
||||
* Caller must lock the main loop.
|
||||
*
|
||||
* @return true on success, false on error
|
||||
*/
|
||||
static bool
|
||||
pulse_output_setup_context(PulseOutput *po, Error &error)
|
||||
bool
|
||||
PulseOutput::SetupContext(Error &error)
|
||||
{
|
||||
assert(po != nullptr);
|
||||
assert(po->mainloop != nullptr);
|
||||
assert(mainloop != nullptr);
|
||||
|
||||
po->context = pa_context_new(pa_threaded_mainloop_get_api(po->mainloop),
|
||||
MPD_PULSE_NAME);
|
||||
if (po->context == nullptr) {
|
||||
context = pa_context_new(pa_threaded_mainloop_get_api(mainloop),
|
||||
MPD_PULSE_NAME);
|
||||
if (context == nullptr) {
|
||||
error.Set(pulse_domain, "pa_context_new() has failed");
|
||||
return false;
|
||||
}
|
||||
|
||||
pa_context_set_state_callback(po->context,
|
||||
pulse_output_context_state_cb, po);
|
||||
pa_context_set_subscribe_callback(po->context,
|
||||
pulse_output_subscribe_cb, po);
|
||||
pa_context_set_state_callback(context,
|
||||
pulse_output_context_state_cb, this);
|
||||
pa_context_set_subscribe_callback(context,
|
||||
pulse_output_subscribe_cb, this);
|
||||
|
||||
if (!pulse_output_connect(po, error)) {
|
||||
pulse_output_delete_context(po);
|
||||
if (!Connect(error)) {
|
||||
DeleteContext();
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
inline bool
|
||||
PulseOutput::Configure(const config_param ¶m, Error &error)
|
||||
{
|
||||
if (!base.Configure(param, error))
|
||||
return false;
|
||||
|
||||
name = param.GetBlockValue("name", "mpd_pulse");
|
||||
server = param.GetBlockValue("server");
|
||||
sink = param.GetBlockValue("sink");
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
static AudioOutput *
|
||||
pulse_output_init(const config_param ¶m, Error &error)
|
||||
{
|
||||
|
|
@ -321,48 +390,34 @@ pulse_output_init(const config_param ¶m, Error &error)
|
|||
setenv("PULSE_PROP_application.icon_name", "mpd", true);
|
||||
|
||||
po = new PulseOutput();
|
||||
if (!po->base.Configure(param, error)) {
|
||||
if (!po->Configure(param, error)) {
|
||||
delete po;
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
po->name = param.GetBlockValue("name", "mpd_pulse");
|
||||
po->server = param.GetBlockValue("server");
|
||||
po->sink = param.GetBlockValue("sink");
|
||||
|
||||
return &po->base;
|
||||
}
|
||||
|
||||
static void
|
||||
pulse_output_finish(AudioOutput *ao)
|
||||
inline bool
|
||||
PulseOutput::Enable(Error &error)
|
||||
{
|
||||
PulseOutput *po = (PulseOutput *)ao;
|
||||
|
||||
delete po;
|
||||
}
|
||||
|
||||
static bool
|
||||
pulse_output_enable(AudioOutput *ao, Error &error)
|
||||
{
|
||||
PulseOutput *po = (PulseOutput *)ao;
|
||||
|
||||
assert(po->mainloop == nullptr);
|
||||
assert(mainloop == nullptr);
|
||||
|
||||
/* create the libpulse mainloop and start the thread */
|
||||
|
||||
po->mainloop = pa_threaded_mainloop_new();
|
||||
if (po->mainloop == nullptr) {
|
||||
mainloop = pa_threaded_mainloop_new();
|
||||
if (mainloop == nullptr) {
|
||||
error.Set(pulse_domain,
|
||||
"pa_threaded_mainloop_new() has failed");
|
||||
return false;
|
||||
}
|
||||
|
||||
pa_threaded_mainloop_lock(po->mainloop);
|
||||
pa_threaded_mainloop_lock(mainloop);
|
||||
|
||||
if (pa_threaded_mainloop_start(po->mainloop) < 0) {
|
||||
pa_threaded_mainloop_unlock(po->mainloop);
|
||||
pa_threaded_mainloop_free(po->mainloop);
|
||||
po->mainloop = nullptr;
|
||||
if (pa_threaded_mainloop_start(mainloop) < 0) {
|
||||
pa_threaded_mainloop_unlock(mainloop);
|
||||
pa_threaded_mainloop_free(mainloop);
|
||||
mainloop = nullptr;
|
||||
|
||||
error.Set(pulse_domain,
|
||||
"pa_threaded_mainloop_start() has failed");
|
||||
|
|
@ -371,53 +426,43 @@ pulse_output_enable(AudioOutput *ao, Error &error)
|
|||
|
||||
/* create the libpulse context and connect it */
|
||||
|
||||
if (!pulse_output_setup_context(po, error)) {
|
||||
pa_threaded_mainloop_unlock(po->mainloop);
|
||||
pa_threaded_mainloop_stop(po->mainloop);
|
||||
pa_threaded_mainloop_free(po->mainloop);
|
||||
po->mainloop = nullptr;
|
||||
if (!SetupContext(error)) {
|
||||
pa_threaded_mainloop_unlock(mainloop);
|
||||
pa_threaded_mainloop_stop(mainloop);
|
||||
pa_threaded_mainloop_free(mainloop);
|
||||
mainloop = nullptr;
|
||||
return false;
|
||||
}
|
||||
|
||||
pa_threaded_mainloop_unlock(po->mainloop);
|
||||
pa_threaded_mainloop_unlock(mainloop);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
static void
|
||||
pulse_output_disable(AudioOutput *ao)
|
||||
inline void
|
||||
PulseOutput::Disable()
|
||||
{
|
||||
PulseOutput *po = (PulseOutput *)ao;
|
||||
assert(mainloop != nullptr);
|
||||
|
||||
assert(po->mainloop != nullptr);
|
||||
|
||||
pa_threaded_mainloop_stop(po->mainloop);
|
||||
if (po->context != nullptr)
|
||||
pulse_output_delete_context(po);
|
||||
pa_threaded_mainloop_free(po->mainloop);
|
||||
po->mainloop = nullptr;
|
||||
pa_threaded_mainloop_stop(mainloop);
|
||||
if (context != nullptr)
|
||||
DeleteContext();
|
||||
pa_threaded_mainloop_free(mainloop);
|
||||
mainloop = nullptr;
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if the context is (already) connected, and waits if not. If
|
||||
* the context has been disconnected, retry to connect.
|
||||
*
|
||||
* Caller must lock the main loop.
|
||||
*
|
||||
* @return true on success, false on error
|
||||
*/
|
||||
static bool
|
||||
pulse_output_wait_connection(PulseOutput *po, Error &error)
|
||||
bool
|
||||
PulseOutput::WaitConnection(Error &error)
|
||||
{
|
||||
assert(po->mainloop != nullptr);
|
||||
assert(mainloop != nullptr);
|
||||
|
||||
pa_context_state_t state;
|
||||
|
||||
if (po->context == nullptr && !pulse_output_setup_context(po, error))
|
||||
if (context == nullptr && !SetupContext(error))
|
||||
return false;
|
||||
|
||||
while (true) {
|
||||
state = pa_context_get_state(po->context);
|
||||
state = pa_context_get_state(context);
|
||||
switch (state) {
|
||||
case PA_CONTEXT_READY:
|
||||
/* nothing to do */
|
||||
|
|
@ -427,15 +472,15 @@ pulse_output_wait_connection(PulseOutput *po, Error &error)
|
|||
case PA_CONTEXT_TERMINATED:
|
||||
case PA_CONTEXT_FAILED:
|
||||
/* failure */
|
||||
SetPulseError(error, po->context, "failed to connect");
|
||||
pulse_output_delete_context(po);
|
||||
SetPulseError(error, context, "failed to connect");
|
||||
DeleteContext();
|
||||
return false;
|
||||
|
||||
case PA_CONTEXT_CONNECTING:
|
||||
case PA_CONTEXT_AUTHORIZING:
|
||||
case PA_CONTEXT_SETTING_NAME:
|
||||
/* wait some more */
|
||||
pa_threaded_mainloop_wait(po->mainloop);
|
||||
pa_threaded_mainloop_wait(mainloop);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -497,62 +542,50 @@ pulse_output_stream_write_cb(gcc_unused pa_stream *stream, size_t nbytes,
|
|||
pa_threaded_mainloop_signal(po->mainloop, 0);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create, set up and connect a context.
|
||||
*
|
||||
* Caller must lock the main loop.
|
||||
*
|
||||
* @return true on success, false on error
|
||||
*/
|
||||
static bool
|
||||
pulse_output_setup_stream(PulseOutput *po, const pa_sample_spec *ss,
|
||||
Error &error)
|
||||
inline bool
|
||||
PulseOutput::SetupStream(const pa_sample_spec &ss, Error &error)
|
||||
{
|
||||
assert(po != nullptr);
|
||||
assert(po->context != nullptr);
|
||||
assert(context != nullptr);
|
||||
|
||||
/* WAVE-EX is been adopted as the speaker map for most media files */
|
||||
pa_channel_map chan_map;
|
||||
pa_channel_map_init_auto(&chan_map, ss->channels,
|
||||
pa_channel_map_init_auto(&chan_map, ss.channels,
|
||||
PA_CHANNEL_MAP_WAVEEX);
|
||||
po->stream = pa_stream_new(po->context, po->name, ss, &chan_map);
|
||||
if (po->stream == nullptr) {
|
||||
SetPulseError(error, po->context,
|
||||
stream = pa_stream_new(context, name, &ss, &chan_map);
|
||||
if (stream == nullptr) {
|
||||
SetPulseError(error, context,
|
||||
"pa_stream_new() has failed");
|
||||
return false;
|
||||
}
|
||||
|
||||
pa_stream_set_suspended_callback(po->stream,
|
||||
pulse_output_stream_suspended_cb, po);
|
||||
pa_stream_set_suspended_callback(stream,
|
||||
pulse_output_stream_suspended_cb,
|
||||
this);
|
||||
|
||||
pa_stream_set_state_callback(po->stream,
|
||||
pulse_output_stream_state_cb, po);
|
||||
pa_stream_set_write_callback(po->stream,
|
||||
pulse_output_stream_write_cb, po);
|
||||
pa_stream_set_state_callback(stream,
|
||||
pulse_output_stream_state_cb, this);
|
||||
pa_stream_set_write_callback(stream,
|
||||
pulse_output_stream_write_cb, this);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
static bool
|
||||
pulse_output_open(AudioOutput *ao, AudioFormat &audio_format,
|
||||
Error &error)
|
||||
inline bool
|
||||
PulseOutput::Open(AudioFormat &audio_format, Error &error)
|
||||
{
|
||||
PulseOutput *po = (PulseOutput *)ao;
|
||||
pa_sample_spec ss;
|
||||
assert(mainloop != nullptr);
|
||||
|
||||
assert(po->mainloop != nullptr);
|
||||
pa_threaded_mainloop_lock(mainloop);
|
||||
|
||||
pa_threaded_mainloop_lock(po->mainloop);
|
||||
|
||||
if (po->context != nullptr) {
|
||||
switch (pa_context_get_state(po->context)) {
|
||||
if (context != nullptr) {
|
||||
switch (pa_context_get_state(context)) {
|
||||
case PA_CONTEXT_UNCONNECTED:
|
||||
case PA_CONTEXT_TERMINATED:
|
||||
case PA_CONTEXT_FAILED:
|
||||
/* the connection was closed meanwhile; delete
|
||||
it, and pulse_output_wait_connection() will
|
||||
reopen it */
|
||||
pulse_output_delete_context(po);
|
||||
DeleteContext();
|
||||
break;
|
||||
|
||||
case PA_CONTEXT_READY:
|
||||
|
|
@ -563,8 +596,8 @@ pulse_output_open(AudioOutput *ao, AudioFormat &audio_format,
|
|||
}
|
||||
}
|
||||
|
||||
if (!pulse_output_wait_connection(po, error)) {
|
||||
pa_threaded_mainloop_unlock(po->mainloop);
|
||||
if (!WaitConnection(error)) {
|
||||
pa_threaded_mainloop_unlock(mainloop);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -572,115 +605,101 @@ pulse_output_open(AudioOutput *ao, AudioFormat &audio_format,
|
|||
we just force MPD to send us everything as 16 bit */
|
||||
audio_format.format = SampleFormat::S16;
|
||||
|
||||
pa_sample_spec ss;
|
||||
ss.format = PA_SAMPLE_S16NE;
|
||||
ss.rate = audio_format.sample_rate;
|
||||
ss.channels = audio_format.channels;
|
||||
|
||||
/* create a stream .. */
|
||||
|
||||
if (!pulse_output_setup_stream(po, &ss, error)) {
|
||||
pa_threaded_mainloop_unlock(po->mainloop);
|
||||
if (!SetupStream(ss, error)) {
|
||||
pa_threaded_mainloop_unlock(mainloop);
|
||||
return false;
|
||||
}
|
||||
|
||||
/* .. and connect it (asynchronously) */
|
||||
|
||||
if (pa_stream_connect_playback(po->stream, po->sink,
|
||||
if (pa_stream_connect_playback(stream, sink,
|
||||
nullptr, pa_stream_flags_t(0),
|
||||
nullptr, nullptr) < 0) {
|
||||
pulse_output_delete_stream(po);
|
||||
DeleteStream();
|
||||
|
||||
SetPulseError(error, po->context,
|
||||
SetPulseError(error, context,
|
||||
"pa_stream_connect_playback() has failed");
|
||||
pa_threaded_mainloop_unlock(po->mainloop);
|
||||
pa_threaded_mainloop_unlock(mainloop);
|
||||
return false;
|
||||
}
|
||||
|
||||
pa_threaded_mainloop_unlock(po->mainloop);
|
||||
|
||||
pa_threaded_mainloop_unlock(mainloop);
|
||||
return true;
|
||||
}
|
||||
|
||||
static void
|
||||
pulse_output_close(AudioOutput *ao)
|
||||
inline void
|
||||
PulseOutput::Close()
|
||||
{
|
||||
PulseOutput *po = (PulseOutput *)ao;
|
||||
pa_operation *o;
|
||||
assert(mainloop != nullptr);
|
||||
|
||||
assert(po->mainloop != nullptr);
|
||||
pa_threaded_mainloop_lock(mainloop);
|
||||
|
||||
pa_threaded_mainloop_lock(po->mainloop);
|
||||
|
||||
if (pa_stream_get_state(po->stream) == PA_STREAM_READY) {
|
||||
o = pa_stream_drain(po->stream,
|
||||
pulse_output_stream_success_cb, po);
|
||||
if (pa_stream_get_state(stream) == PA_STREAM_READY) {
|
||||
pa_operation *o =
|
||||
pa_stream_drain(stream,
|
||||
pulse_output_stream_success_cb, this);
|
||||
if (o == nullptr) {
|
||||
LogPulseError(po->context,
|
||||
LogPulseError(context,
|
||||
"pa_stream_drain() has failed");
|
||||
} else
|
||||
pulse_wait_for_operation(po->mainloop, o);
|
||||
pulse_wait_for_operation(mainloop, o);
|
||||
}
|
||||
|
||||
pulse_output_delete_stream(po);
|
||||
DeleteStream();
|
||||
|
||||
if (po->context != nullptr &&
|
||||
pa_context_get_state(po->context) != PA_CONTEXT_READY)
|
||||
pulse_output_delete_context(po);
|
||||
if (context != nullptr &&
|
||||
pa_context_get_state(context) != PA_CONTEXT_READY)
|
||||
DeleteContext();
|
||||
|
||||
pa_threaded_mainloop_unlock(po->mainloop);
|
||||
pa_threaded_mainloop_unlock(mainloop);
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if the stream is (already) connected, and waits if not. The
|
||||
* mainloop must be locked before calling this function.
|
||||
*
|
||||
* @return true on success, false on error
|
||||
*/
|
||||
static bool
|
||||
pulse_output_wait_stream(PulseOutput *po, Error &error)
|
||||
bool
|
||||
PulseOutput::WaitStream(Error &error)
|
||||
{
|
||||
while (true) {
|
||||
switch (pa_stream_get_state(po->stream)) {
|
||||
switch (pa_stream_get_state(stream)) {
|
||||
case PA_STREAM_READY:
|
||||
return true;
|
||||
|
||||
case PA_STREAM_FAILED:
|
||||
case PA_STREAM_TERMINATED:
|
||||
case PA_STREAM_UNCONNECTED:
|
||||
SetPulseError(error, po->context,
|
||||
SetPulseError(error, context,
|
||||
"failed to connect the stream");
|
||||
return false;
|
||||
|
||||
case PA_STREAM_CREATING:
|
||||
pa_threaded_mainloop_wait(po->mainloop);
|
||||
pa_threaded_mainloop_wait(mainloop);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets cork mode on the stream.
|
||||
*/
|
||||
static bool
|
||||
pulse_output_stream_pause(PulseOutput *po, bool pause,
|
||||
Error &error)
|
||||
bool
|
||||
PulseOutput::StreamPause(bool pause, Error &error)
|
||||
{
|
||||
pa_operation *o;
|
||||
assert(mainloop != nullptr);
|
||||
assert(context != nullptr);
|
||||
assert(stream != nullptr);
|
||||
|
||||
assert(po->mainloop != nullptr);
|
||||
assert(po->context != nullptr);
|
||||
assert(po->stream != nullptr);
|
||||
|
||||
o = pa_stream_cork(po->stream, pause,
|
||||
pulse_output_stream_success_cb, po);
|
||||
pa_operation *o = pa_stream_cork(stream, pause,
|
||||
pulse_output_stream_success_cb, this);
|
||||
if (o == nullptr) {
|
||||
SetPulseError(error, po->context,
|
||||
SetPulseError(error, context,
|
||||
"pa_stream_cork() has failed");
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!pulse_wait_for_operation(po->mainloop, o)) {
|
||||
SetPulseError(error, po->context,
|
||||
if (!pulse_wait_for_operation(mainloop, o)) {
|
||||
SetPulseError(error, context,
|
||||
"pa_stream_cork() has failed");
|
||||
return false;
|
||||
}
|
||||
|
|
@ -688,65 +707,59 @@ pulse_output_stream_pause(PulseOutput *po, bool pause,
|
|||
return true;
|
||||
}
|
||||
|
||||
static unsigned
|
||||
pulse_output_delay(AudioOutput *ao)
|
||||
inline unsigned
|
||||
PulseOutput::Delay()
|
||||
{
|
||||
PulseOutput *po = (PulseOutput *)ao;
|
||||
pa_threaded_mainloop_lock(mainloop);
|
||||
|
||||
unsigned result = 0;
|
||||
|
||||
pa_threaded_mainloop_lock(po->mainloop);
|
||||
|
||||
if (po->base.pause && pa_stream_is_corked(po->stream) &&
|
||||
pa_stream_get_state(po->stream) == PA_STREAM_READY)
|
||||
if (base.pause && pa_stream_is_corked(stream) &&
|
||||
pa_stream_get_state(stream) == PA_STREAM_READY)
|
||||
/* idle while paused */
|
||||
result = 1000;
|
||||
|
||||
pa_threaded_mainloop_unlock(po->mainloop);
|
||||
pa_threaded_mainloop_unlock(mainloop);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
static size_t
|
||||
pulse_output_play(AudioOutput *ao, const void *chunk, size_t size,
|
||||
Error &error)
|
||||
inline size_t
|
||||
PulseOutput::Play(const void *chunk, size_t size, Error &error)
|
||||
{
|
||||
PulseOutput *po = (PulseOutput *)ao;
|
||||
assert(mainloop != nullptr);
|
||||
assert(stream != nullptr);
|
||||
|
||||
assert(po->mainloop != nullptr);
|
||||
assert(po->stream != nullptr);
|
||||
|
||||
pa_threaded_mainloop_lock(po->mainloop);
|
||||
pa_threaded_mainloop_lock(mainloop);
|
||||
|
||||
/* check if the stream is (already) connected */
|
||||
|
||||
if (!pulse_output_wait_stream(po, error)) {
|
||||
pa_threaded_mainloop_unlock(po->mainloop);
|
||||
if (!WaitStream(error)) {
|
||||
pa_threaded_mainloop_unlock(mainloop);
|
||||
return 0;
|
||||
}
|
||||
|
||||
assert(po->context != nullptr);
|
||||
assert(context != nullptr);
|
||||
|
||||
/* unpause if previously paused */
|
||||
|
||||
if (pa_stream_is_corked(po->stream) &&
|
||||
!pulse_output_stream_pause(po, false, error)) {
|
||||
pa_threaded_mainloop_unlock(po->mainloop);
|
||||
if (pa_stream_is_corked(stream) && !StreamPause(false, error)) {
|
||||
pa_threaded_mainloop_unlock(mainloop);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* wait until the server allows us to write */
|
||||
|
||||
while (po->writable == 0) {
|
||||
if (pa_stream_is_suspended(po->stream)) {
|
||||
pa_threaded_mainloop_unlock(po->mainloop);
|
||||
while (writable == 0) {
|
||||
if (pa_stream_is_suspended(stream)) {
|
||||
pa_threaded_mainloop_unlock(mainloop);
|
||||
error.Set(pulse_domain, "suspended");
|
||||
return 0;
|
||||
}
|
||||
|
||||
pa_threaded_mainloop_wait(po->mainloop);
|
||||
pa_threaded_mainloop_wait(mainloop);
|
||||
|
||||
if (pa_stream_get_state(po->stream) != PA_STREAM_READY) {
|
||||
pa_threaded_mainloop_unlock(po->mainloop);
|
||||
if (pa_stream_get_state(stream) != PA_STREAM_READY) {
|
||||
pa_threaded_mainloop_unlock(mainloop);
|
||||
error.Set(pulse_domain, "disconnected");
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -754,121 +767,121 @@ pulse_output_play(AudioOutput *ao, const void *chunk, size_t size,
|
|||
|
||||
/* now write */
|
||||
|
||||
if (size > po->writable)
|
||||
if (size > writable)
|
||||
/* don't send more than possible */
|
||||
size = po->writable;
|
||||
size = writable;
|
||||
|
||||
po->writable -= size;
|
||||
writable -= size;
|
||||
|
||||
int result = pa_stream_write(po->stream, chunk, size, nullptr,
|
||||
int result = pa_stream_write(stream, chunk, size, nullptr,
|
||||
0, PA_SEEK_RELATIVE);
|
||||
pa_threaded_mainloop_unlock(po->mainloop);
|
||||
pa_threaded_mainloop_unlock(mainloop);
|
||||
if (result < 0) {
|
||||
SetPulseError(error, po->context, "pa_stream_write() failed");
|
||||
SetPulseError(error, context, "pa_stream_write() failed");
|
||||
return 0;
|
||||
}
|
||||
|
||||
return size;
|
||||
}
|
||||
|
||||
static void
|
||||
pulse_output_cancel(AudioOutput *ao)
|
||||
inline void
|
||||
PulseOutput::Cancel()
|
||||
{
|
||||
PulseOutput *po = (PulseOutput *)ao;
|
||||
pa_operation *o;
|
||||
assert(mainloop != nullptr);
|
||||
assert(stream != nullptr);
|
||||
|
||||
assert(po->mainloop != nullptr);
|
||||
assert(po->stream != nullptr);
|
||||
pa_threaded_mainloop_lock(mainloop);
|
||||
|
||||
pa_threaded_mainloop_lock(po->mainloop);
|
||||
|
||||
if (pa_stream_get_state(po->stream) != PA_STREAM_READY) {
|
||||
if (pa_stream_get_state(stream) != PA_STREAM_READY) {
|
||||
/* no need to flush when the stream isn't connected
|
||||
yet */
|
||||
pa_threaded_mainloop_unlock(po->mainloop);
|
||||
pa_threaded_mainloop_unlock(mainloop);
|
||||
return;
|
||||
}
|
||||
|
||||
assert(po->context != nullptr);
|
||||
assert(context != nullptr);
|
||||
|
||||
o = pa_stream_flush(po->stream, pulse_output_stream_success_cb, po);
|
||||
pa_operation *o = pa_stream_flush(stream,
|
||||
pulse_output_stream_success_cb,
|
||||
this);
|
||||
if (o == nullptr) {
|
||||
LogPulseError(po->context, "pa_stream_flush() has failed");
|
||||
pa_threaded_mainloop_unlock(po->mainloop);
|
||||
LogPulseError(context, "pa_stream_flush() has failed");
|
||||
pa_threaded_mainloop_unlock(mainloop);
|
||||
return;
|
||||
}
|
||||
|
||||
pulse_wait_for_operation(po->mainloop, o);
|
||||
pa_threaded_mainloop_unlock(po->mainloop);
|
||||
pulse_wait_for_operation(mainloop, o);
|
||||
pa_threaded_mainloop_unlock(mainloop);
|
||||
}
|
||||
|
||||
static bool
|
||||
pulse_output_pause(AudioOutput *ao)
|
||||
inline bool
|
||||
PulseOutput::Pause()
|
||||
{
|
||||
PulseOutput *po = (PulseOutput *)ao;
|
||||
assert(mainloop != nullptr);
|
||||
assert(stream != nullptr);
|
||||
|
||||
assert(po->mainloop != nullptr);
|
||||
assert(po->stream != nullptr);
|
||||
|
||||
pa_threaded_mainloop_lock(po->mainloop);
|
||||
pa_threaded_mainloop_lock(mainloop);
|
||||
|
||||
/* check if the stream is (already/still) connected */
|
||||
|
||||
Error error;
|
||||
if (!pulse_output_wait_stream(po, error)) {
|
||||
pa_threaded_mainloop_unlock(po->mainloop);
|
||||
if (!WaitStream(error)) {
|
||||
pa_threaded_mainloop_unlock(mainloop);
|
||||
LogError(error);
|
||||
return false;
|
||||
}
|
||||
|
||||
assert(po->context != nullptr);
|
||||
assert(context != nullptr);
|
||||
|
||||
/* cork the stream */
|
||||
|
||||
if (!pa_stream_is_corked(po->stream) &&
|
||||
!pulse_output_stream_pause(po, true, error)) {
|
||||
pa_threaded_mainloop_unlock(po->mainloop);
|
||||
if (!pa_stream_is_corked(stream) && !StreamPause(true, error)) {
|
||||
pa_threaded_mainloop_unlock(mainloop);
|
||||
LogError(error);
|
||||
return false;
|
||||
}
|
||||
|
||||
pa_threaded_mainloop_unlock(po->mainloop);
|
||||
|
||||
pa_threaded_mainloop_unlock(mainloop);
|
||||
return true;
|
||||
}
|
||||
|
||||
static bool
|
||||
pulse_output_test_default_device(void)
|
||||
inline bool
|
||||
PulseOutput::TestDefaultDevice()
|
||||
{
|
||||
bool success;
|
||||
|
||||
const config_param empty;
|
||||
PulseOutput *po = (PulseOutput *)
|
||||
pulse_output_init(empty, IgnoreError());
|
||||
if (po == nullptr)
|
||||
return false;
|
||||
|
||||
success = pulse_output_wait_connection(po, IgnoreError());
|
||||
pulse_output_finish(&po->base);
|
||||
|
||||
bool success = po->WaitConnection(IgnoreError());
|
||||
delete po;
|
||||
return success;
|
||||
}
|
||||
|
||||
static bool
|
||||
pulse_output_test_default_device(void)
|
||||
{
|
||||
return PulseOutput::TestDefaultDevice();
|
||||
}
|
||||
|
||||
typedef AudioOutputWrapper<PulseOutput> Wrapper;
|
||||
|
||||
const struct AudioOutputPlugin pulse_output_plugin = {
|
||||
"pulse",
|
||||
pulse_output_test_default_device,
|
||||
pulse_output_init,
|
||||
pulse_output_finish,
|
||||
pulse_output_enable,
|
||||
pulse_output_disable,
|
||||
pulse_output_open,
|
||||
pulse_output_close,
|
||||
pulse_output_delay,
|
||||
&Wrapper::Finish,
|
||||
&Wrapper::Enable,
|
||||
&Wrapper::Disable,
|
||||
&Wrapper::Open,
|
||||
&Wrapper::Close,
|
||||
&Wrapper::Delay,
|
||||
nullptr,
|
||||
pulse_output_play,
|
||||
&Wrapper::Play,
|
||||
nullptr,
|
||||
pulse_output_cancel,
|
||||
pulse_output_pause,
|
||||
&Wrapper::Cancel,
|
||||
&Wrapper::Pause,
|
||||
|
||||
&pulse_mixer_plugin,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
#include <SLES/OpenSLES_Android.h>
|
||||
|
||||
class SlesOutput {
|
||||
friend AudioOutputWrapper<SlesOutput>;
|
||||
friend struct AudioOutputWrapper<SlesOutput>;
|
||||
|
||||
static constexpr unsigned N_BUFFERS = 3;
|
||||
static constexpr size_t BUFFER_SIZE = 65536;
|
||||
|
|
|
|||
Loading…
Reference in New Issue