filter/Internal: rename struct AudioOutput to FilteredAudioOutput

Prepare to add an abstract class AudioOutput, to be implemented by
plugins, to get rid of the C-style vtable.
This commit is contained in:
Max Kellermann
2017-08-07 18:47:39 +02:00
parent fc04620519
commit d0157af13e
43 changed files with 138 additions and 138 deletions

View File

@@ -64,7 +64,7 @@ class AlsaOutput final
friend struct AudioOutputWrapper<AlsaOutput>;
AudioOutput base;
FilteredAudioOutput base;
Manual<PcmExport> pcm_export;

View File

@@ -40,7 +40,7 @@ static unsigned ao_output_ref;
class AoOutput {
friend struct AudioOutputWrapper<AoOutput>;
AudioOutput base;
FilteredAudioOutput base;
const size_t write_size;
int driver;

View File

@@ -37,7 +37,7 @@
class FifoOutput {
friend struct AudioOutputWrapper<FifoOutput>;
AudioOutput base;
FilteredAudioOutput base;
const AllocatedPath path;
std::string path_utf8;

View File

@@ -48,7 +48,7 @@ class HaikuOutput {
friend int haiku_output_get_volume(HaikuOutput &haiku);
friend bool haiku_output_set_volume(HaikuOutput &haiku, unsigned volume);
AudioOutput base;
FilteredAudioOutput base;
size_t write_size;

View File

@@ -43,7 +43,7 @@ static constexpr unsigned MAX_PORTS = 16;
static constexpr size_t jack_sample_size = sizeof(jack_default_audio_sample_t);
struct JackOutput {
AudioOutput base;
FilteredAudioOutput base;
/**
* libjack options passed to jack_client_open().
@@ -443,7 +443,7 @@ JackOutput::Disable()
}
}
static AudioOutput *
static FilteredAudioOutput *
mpd_jack_init(EventLoop &, const ConfigBlock &block)
{
jack_set_error_function(mpd_jack_error);

View File

@@ -26,7 +26,7 @@
class NullOutput {
friend struct AudioOutputWrapper<NullOutput>;
AudioOutput base;
FilteredAudioOutput base;
const bool sync;

View File

@@ -36,7 +36,7 @@
#include <memory>
struct OSXOutput {
AudioOutput base;
FilteredAudioOutput base;
/* configuration settings */
OSType component_subtype;
@@ -103,7 +103,7 @@ OSXOutput::OSXOutput(const ConfigBlock &block)
sync_sample_rate = block.GetBlockValue("sync_sample_rate", false);
}
static AudioOutput *
static FilteredAudioOutput *
osx_output_init(EventLoop &, const ConfigBlock &block)
{
OSXOutput *oo = new OSXOutput(block);
@@ -128,7 +128,7 @@ osx_output_init(EventLoop &, const ConfigBlock &block)
}
static void
osx_output_finish(AudioOutput *ao)
osx_output_finish(FilteredAudioOutput *ao)
{
OSXOutput *oo = (OSXOutput *)ao;
@@ -514,7 +514,7 @@ osx_render(void *vdata,
}
static void
osx_output_enable(AudioOutput *ao)
osx_output_enable(FilteredAudioOutput *ao)
{
char errormsg[1024];
OSXOutput *oo = (OSXOutput *)ao;
@@ -550,7 +550,7 @@ osx_output_enable(AudioOutput *ao)
}
static void
osx_output_disable(AudioOutput *ao)
osx_output_disable(FilteredAudioOutput *ao)
{
OSXOutput *oo = (OSXOutput *)ao;
@@ -562,7 +562,7 @@ osx_output_disable(AudioOutput *ao)
}
static void
osx_output_close(AudioOutput *ao)
osx_output_close(FilteredAudioOutput *ao)
{
OSXOutput *od = (OSXOutput *)ao;
@@ -573,7 +573,7 @@ osx_output_close(AudioOutput *ao)
}
static void
osx_output_open(AudioOutput *ao, AudioFormat &audio_format)
osx_output_open(FilteredAudioOutput *ao, AudioFormat &audio_format)
{
char errormsg[1024];
OSXOutput *od = (OSXOutput *)ao;
@@ -663,14 +663,14 @@ osx_output_open(AudioOutput *ao, AudioFormat &audio_format)
}
static size_t
osx_output_play(AudioOutput *ao, const void *chunk, size_t size)
osx_output_play(FilteredAudioOutput *ao, const void *chunk, size_t size)
{
OSXOutput *od = (OSXOutput *)ao;
return od->ring_buffer->push((uint8_t *)chunk, size);
}
static std::chrono::steady_clock::duration
osx_output_delay(AudioOutput *ao) noexcept
osx_output_delay(FilteredAudioOutput *ao) noexcept
{
OSXOutput *od = (OSXOutput *)ao;
return od->ring_buffer->write_available()

View File

@@ -39,7 +39,7 @@ class OpenALOutput {
/* should be enough for buffer size = 2048 */
static constexpr unsigned NUM_BUFFERS = 16;
AudioOutput base;
FilteredAudioOutput base;
const char *device_name;
ALCdevice *device;

View File

@@ -63,7 +63,7 @@
class OssOutput {
friend struct AudioOutputWrapper<OssOutput>;
AudioOutput base;
FilteredAudioOutput base;
#ifdef AFMT_S24_PACKED
Manual<PcmExport> pcm_export;

View File

@@ -31,7 +31,7 @@
class PipeOutput {
friend struct AudioOutputWrapper<PipeOutput>;
AudioOutput base;
FilteredAudioOutput base;
const std::string cmd;
FILE *fh;

View File

@@ -47,7 +47,7 @@
class PulseOutput {
friend struct AudioOutputWrapper<PulseOutput>;
AudioOutput base;
FilteredAudioOutput base;
const char *name;
const char *server;

View File

@@ -45,7 +45,7 @@ static constexpr Domain recorder_domain("recorder");
class RecorderOutput {
friend struct AudioOutputWrapper<RecorderOutput>;
AudioOutput base;
FilteredAudioOutput base;
/**
* The configured encoder plugin.

View File

@@ -39,7 +39,7 @@
class RoarOutput {
friend struct AudioOutputWrapper<RoarOutput>;
AudioOutput base;
FilteredAudioOutput base;
const std::string host, name;
@@ -54,7 +54,7 @@ class RoarOutput {
public:
RoarOutput(const ConfigBlock &block);
operator AudioOutput *() {
operator FilteredAudioOutput *() {
return &base;
}

View File

@@ -40,7 +40,7 @@
static constexpr unsigned DEFAULT_CONN_TIMEOUT = 2;
struct ShoutOutput final {
AudioOutput base;
FilteredAudioOutput base;
shout_t *shout_conn;
shout_metadata_t *shout_meta;

View File

@@ -47,7 +47,7 @@ static constexpr Domain sndio_output_domain("sndio_output");
class SndioOutput {
friend struct AudioOutputWrapper<SndioOutput>;
AudioOutput base;
FilteredAudioOutput base;
const char *const device;
const unsigned buffer_time; /* in ms */
struct sio_hdl *sio_hdl;

View File

@@ -53,7 +53,7 @@ struct audio_info {
class SolarisOutput {
friend struct AudioOutputWrapper<SolarisOutput>;
AudioOutput base;
FilteredAudioOutput base;
/* configuration */
const char *const device;

View File

@@ -42,7 +42,7 @@ struct WinmmBuffer {
class WinmmOutput {
friend struct AudioOutputWrapper<WinmmOutput>;
AudioOutput base;
FilteredAudioOutput base;
const UINT device_id;
HWAVEOUT handle;

View File

@@ -52,7 +52,7 @@ struct Tag;
class HttpdOutput final : ServerSocket, DeferredMonitor {
friend struct AudioOutputWrapper<HttpdOutput>;
AudioOutput base;
FilteredAudioOutput base;
/**
* True if the audio output is open and accepts client
@@ -160,7 +160,7 @@ public:
static HttpdOutput *Create(EventLoop &event_loop,
const ConfigBlock &block);
static constexpr HttpdOutput *Cast(AudioOutput *ao) {
static constexpr HttpdOutput *Cast(FilteredAudioOutput *ao) {
return &ContainerCast(*ao, &HttpdOutput::base);
}

View File

@@ -43,7 +43,7 @@ class SlesOutput {
static constexpr unsigned N_BUFFERS = 3;
static constexpr size_t BUFFER_SIZE = 65536;
AudioOutput base;
FilteredAudioOutput base;
SLES::Object engine_object, mix_object, play_object;
SLES::Play play;
@@ -89,7 +89,7 @@ class SlesOutput {
public:
SlesOutput(const ConfigBlock &block);
operator AudioOutput *() {
operator FilteredAudioOutput *() {
return &base;
}