output: move functions into the AudioOutput struct

This commit is contained in:
Max Kellermann
2014-01-28 11:39:12 +01:00
parent cb7366f472
commit 4657a3bd0f
25 changed files with 290 additions and 338 deletions

View File

@@ -125,7 +125,7 @@ struct AlsaOutput {
}
bool Init(const config_param &param, Error &error) {
return ao_base_init(&base, param, error);
return base.Configure(param, error);
}
};

View File

@@ -46,7 +46,7 @@ struct AoOutput {
:base(ao_output_plugin) {}
bool Initialize(const config_param &param, Error &error) {
return ao_base_init(&base, param, error);
return base.Configure(param, error);
}
bool Configure(const config_param &param, Error &error);

View File

@@ -52,7 +52,7 @@ struct FifoOutput {
created(false) {}
bool Initialize(const config_param &param, Error &error) {
return ao_base_init(&base, param, error);
return base.Configure(param, error);
}
bool Create(Error &error);

View File

@@ -137,7 +137,7 @@ HttpdOutput::Configure(const config_param &param, Error &error)
inline bool
HttpdOutput::Init(const config_param &param, Error &error)
{
return ao_base_init(&base, param, error);
return base.Configure(param, error);
}
static AudioOutput *

View File

@@ -83,7 +83,7 @@ struct JackOutput {
:base(jack_output_plugin) {}
bool Initialize(const config_param &param, Error &error_r) {
return ao_base_init(&base, param, error_r);
return base.Configure(param, error_r);
}
};

View File

@@ -33,7 +33,7 @@ struct NullOutput {
:base(null_output_plugin) {}
bool Initialize(const config_param &param, Error &error) {
return ao_base_init(&base, param, error);
return base.Configure(param, error);
}
};

View File

@@ -84,7 +84,7 @@ static AudioOutput *
osx_output_init(const config_param &param, Error &error)
{
OSXOutput *oo = new OSXOutput();
if (!ao_base_init(&oo->base, param, error)) {
if (!oo->base.Configure(param, error)) {
delete oo;
return NULL;
}

View File

@@ -52,7 +52,7 @@ struct OpenALOutput {
:base(openal_output_plugin) {}
bool Initialize(const config_param &param, Error &error_r) {
return ao_base_init(&base, param, error_r);
return base.Configure(param, error_r);
}
};

View File

@@ -83,7 +83,7 @@ struct OssOutput {
fd(-1), device(nullptr) {}
bool Initialize(const config_param &param, Error &error_r) {
return ao_base_init(&base, param, error_r);
return base.Configure(param, error_r);
}
};

View File

@@ -38,7 +38,7 @@ struct PipeOutput {
:base(pipe_output_plugin) {}
bool Initialize(const config_param &param, Error &error) {
return ao_base_init(&base, param, error);
return base.Configure(param, error);
}
bool Configure(const config_param &param, Error &error);

View File

@@ -334,7 +334,7 @@ pulse_output_init(const config_param &param, Error &error)
g_setenv("PULSE_PROP_media.role", "music", true);
po = new PulseOutput();
if (!ao_base_init(&po->base, param, error)) {
if (!po->base.Configure(param, error)) {
delete po;
return nullptr;
}

View File

@@ -61,7 +61,7 @@ struct RecorderOutput {
:base(recorder_output_plugin) {}
bool Initialize(const config_param &param, Error &error_r) {
return ao_base_init(&base, param, error_r);
return base.Configure(param, error_r);
}
bool Configure(const config_param &param, Error &error);

View File

@@ -58,7 +58,7 @@ public:
}
bool Initialize(const config_param &param, Error &error) {
return ao_base_init(&base, param, error);
return base.Configure(param, error);
}
void Configure(const config_param &param);

View File

@@ -69,7 +69,7 @@ struct ShoutOutput final {
}
bool Initialize(const config_param &param, Error &error) {
return ao_base_init(&base, param, error);
return base.Configure(param, error);
}
bool Configure(const config_param &param, Error &error);

View File

@@ -61,7 +61,7 @@ struct SolarisOutput {
:base(solaris_output_plugin) {}
bool Initialize(const config_param &param, Error &error_r) {
return ao_base_init(&base, param, error_r);
return base.Configure(param, error_r);
}
};

View File

@@ -52,7 +52,7 @@ struct WinmmOutput {
WinmmBuffer buffers[8];
unsigned next_buffer;
WinmmBuffer()
WinmmOutput()
:base(winmm_output_plugin) {}
};
@@ -115,7 +115,7 @@ static AudioOutput *
winmm_output_init(const config_param &param, Error &error)
{
WinmmOutput *wo = new WinmmOutput();
if (!ao_base_init(&wo->base, param, error)) {
if (!wo->base.Configure(param, error)) {
delete wo;
return nullptr;
}