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

filter/Internal: rename struct AudioOutput to FilteredAudioOutput

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

18
src/output/plugins/OSXOutputPlugin.cxx
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()