aboutsummaryrefslogtreecommitdiffstats
path: root/src/audioOutputs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/audioOutputs/audioOutput_alsa.c17
-rw-r--r--src/audioOutputs/audioOutput_ao.c16
-rw-r--r--src/audioOutputs/audioOutput_fifo.c16
-rw-r--r--src/audioOutputs/audioOutput_jack.c17
-rw-r--r--src/audioOutputs/audioOutput_mvp.c17
-rw-r--r--src/audioOutputs/audioOutput_null.c15
-rw-r--r--src/audioOutputs/audioOutput_oss.c17
-rw-r--r--src/audioOutputs/audioOutput_osx.c17
-rw-r--r--src/audioOutputs/audioOutput_pulse.c17
-rw-r--r--src/audioOutputs/audioOutput_shout.c17
10 files changed, 76 insertions, 90 deletions
diff --git a/src/audioOutputs/audioOutput_alsa.c b/src/audioOutputs/audioOutput_alsa.c
index e21466963..d28deb733 100644
--- a/src/audioOutputs/audioOutput_alsa.c
+++ b/src/audioOutputs/audioOutput_alsa.c
@@ -406,15 +406,14 @@ static int alsa_playAudio(void *data, const char *playChunk, size_t size)
}
const struct audio_output_plugin alsaPlugin = {
- "alsa",
- alsa_testDefault,
- alsa_initDriver,
- alsa_finishDriver,
- alsa_openDevice,
- alsa_playAudio,
- alsa_dropBufferedAudio,
- alsa_closeDevice,
- NULL, /* sendMetadataFunc */
+ .name = "alsa",
+ .test_default_device = alsa_testDefault,
+ .init = alsa_initDriver,
+ .finish = alsa_finishDriver,
+ .open = alsa_openDevice,
+ .play = alsa_playAudio,
+ .cancel = alsa_dropBufferedAudio,
+ .close = alsa_closeDevice,
};
#else /* HAVE ALSA */
diff --git a/src/audioOutputs/audioOutput_ao.c b/src/audioOutputs/audioOutput_ao.c
index e712d582a..b91895bde 100644
--- a/src/audioOutputs/audioOutput_ao.c
+++ b/src/audioOutputs/audioOutput_ao.c
@@ -238,15 +238,13 @@ static int audioOutputAo_play(void *data, const char *playChunk, size_t size)
}
const struct audio_output_plugin aoPlugin = {
- "ao",
- NULL,
- audioOutputAo_initDriver,
- audioOutputAo_finishDriver,
- audioOutputAo_openDevice,
- audioOutputAo_play,
- audioOutputAo_dropBufferedAudio,
- audioOutputAo_closeDevice,
- NULL, /* sendMetadataFunc */
+ .name = "ao",
+ .init = audioOutputAo_initDriver,
+ .finish = audioOutputAo_finishDriver,
+ .open = audioOutputAo_openDevice,
+ .play = audioOutputAo_play,
+ .cancel = audioOutputAo_dropBufferedAudio,
+ .close = audioOutputAo_closeDevice,
};
#else
diff --git a/src/audioOutputs/audioOutput_fifo.c b/src/audioOutputs/audioOutput_fifo.c
index 7a0180741..62257f6cb 100644
--- a/src/audioOutputs/audioOutput_fifo.c
+++ b/src/audioOutputs/audioOutput_fifo.c
@@ -270,15 +270,13 @@ static int fifo_playAudio(void *data,
}
const struct audio_output_plugin fifoPlugin = {
- "fifo",
- NULL, /* testDefaultDeviceFunc */
- fifo_initDriver,
- fifo_finishDriver,
- fifo_openDevice,
- fifo_playAudio,
- fifo_dropBufferedAudio,
- fifo_closeDevice,
- NULL, /* sendMetadataFunc */
+ .name = "fifo",
+ .init = fifo_initDriver,
+ .finish = fifo_finishDriver,
+ .open = fifo_openDevice,
+ .play = fifo_playAudio,
+ .cancel = fifo_dropBufferedAudio,
+ .close = fifo_closeDevice,
};
#else /* HAVE_FIFO */
diff --git a/src/audioOutputs/audioOutput_jack.c b/src/audioOutputs/audioOutput_jack.c
index f817bd435..a0e39506c 100644
--- a/src/audioOutputs/audioOutput_jack.c
+++ b/src/audioOutputs/audioOutput_jack.c
@@ -435,15 +435,14 @@ static int jack_playAudio(void *data,
}
const struct audio_output_plugin jackPlugin = {
- "jack",
- jack_testDefault,
- jack_initDriver,
- jack_finishDriver,
- jack_openDevice,
- jack_playAudio,
- jack_dropBufferedAudio,
- jack_closeDevice,
- NULL, /* sendMetadataFunc */
+ .name = "jack",
+ .test_default_device = jack_testDefault,
+ .init = jack_initDriver,
+ .finish = jack_finishDriver,
+ .open = jack_openDevice,
+ .play = jack_playAudio,
+ .cancel = jack_dropBufferedAudio,
+ .close = jack_closeDevice,
};
#else /* HAVE JACK */
diff --git a/src/audioOutputs/audioOutput_mvp.c b/src/audioOutputs/audioOutput_mvp.c
index 9ffdd4fdf..d22747408 100644
--- a/src/audioOutputs/audioOutput_mvp.c
+++ b/src/audioOutputs/audioOutput_mvp.c
@@ -257,15 +257,14 @@ static int mvp_playAudio(struct audio_output *audioOutput,
}
const struct audio_output_plugin mvpPlugin = {
- "mvp",
- mvp_testDefault,
- mvp_initDriver,
- mvp_finishDriver,
- mvp_openDevice,
- mvp_playAudio,
- mvp_dropBufferedAudio,
- mvp_closeDevice,
- NULL, /* sendMetadataFunc */
+ .name = "mvp",
+ .test_default_device = mvp_testDefault,
+ .init = mvp_initDriver,
+ .finish = mvp_finishDriver,
+ .open = mvp_openDevice,
+ .play = mvp_playAudio,
+ .cancel = mvp_dropBufferedAudio,
+ .close = mvp_closeDevice,
};
#else /* HAVE_MVP */
diff --git a/src/audioOutputs/audioOutput_null.c b/src/audioOutputs/audioOutput_null.c
index 564f8b870..ff3a9833c 100644
--- a/src/audioOutputs/audioOutput_null.c
+++ b/src/audioOutputs/audioOutput_null.c
@@ -76,13 +76,10 @@ static void null_dropBufferedAudio(void *data)
}
const struct audio_output_plugin nullPlugin = {
- "null",
- NULL,
- null_initDriver,
- NULL,
- null_openDevice,
- null_playAudio,
- null_dropBufferedAudio,
- null_closeDevice,
- NULL,
+ .name = "null",
+ .init = null_initDriver,
+ .open = null_openDevice,
+ .play = null_playAudio,
+ .cancel = null_dropBufferedAudio,
+ .close = null_closeDevice,
};
diff --git a/src/audioOutputs/audioOutput_oss.c b/src/audioOutputs/audioOutput_oss.c
index ae483877b..39763edcb 100644
--- a/src/audioOutputs/audioOutput_oss.c
+++ b/src/audioOutputs/audioOutput_oss.c
@@ -544,15 +544,14 @@ static int oss_playAudio(void *data,
}
const struct audio_output_plugin ossPlugin = {
- "oss",
- oss_testDefault,
- oss_initDriver,
- oss_finishDriver,
- oss_openDevice,
- oss_playAudio,
- oss_dropBufferedAudio,
- oss_closeDevice,
- NULL, /* sendMetadataFunc */
+ .name = "oss",
+ .test_default_device = oss_testDefault,
+ .init = oss_initDriver,
+ .finish = oss_finishDriver,
+ .open = oss_openDevice,
+ .play = oss_playAudio,
+ .cancel = oss_dropBufferedAudio,
+ .close = oss_closeDevice,
};
#else /* HAVE OSS */
diff --git a/src/audioOutputs/audioOutput_osx.c b/src/audioOutputs/audioOutput_osx.c
index b87504bd5..9071ed6c9 100644
--- a/src/audioOutputs/audioOutput_osx.c
+++ b/src/audioOutputs/audioOutput_osx.c
@@ -353,15 +353,14 @@ static int osx_play(struct audio_output *audioOutput,
}
const struct audio_output_plugin osxPlugin = {
- "osx",
- osx_testDefault,
- osx_initDriver,
- osx_finishDriver,
- osx_openDevice,
- osx_play,
- osx_dropBufferedAudio,
- osx_closeDevice,
- NULL, /* sendMetadataFunc */
+ .name = "osx",
+ .test_default_device = osx_testDefault,
+ .init = osx_initDriver,
+ .finish = osx_finishDriver,
+ .open = osx_openDevice,
+ .play = osx_play,
+ .cancel = osx_dropBufferedAudio,
+ .close = osx_closeDevice,
};
#else
diff --git a/src/audioOutputs/audioOutput_pulse.c b/src/audioOutputs/audioOutput_pulse.c
index 91fea9c60..38014c8f0 100644
--- a/src/audioOutputs/audioOutput_pulse.c
+++ b/src/audioOutputs/audioOutput_pulse.c
@@ -204,15 +204,14 @@ static int pulse_playAudio(void *data,
}
const struct audio_output_plugin pulsePlugin = {
- "pulse",
- pulse_testDefault,
- pulse_initDriver,
- pulse_finishDriver,
- pulse_openDevice,
- pulse_playAudio,
- pulse_dropBufferedAudio,
- pulse_closeDevice,
- NULL, /* sendMetadataFunc */
+ .name = "pulse",
+ .test_default_device = pulse_testDefault,
+ .init = pulse_initDriver,
+ .finish = pulse_finishDriver,
+ .open = pulse_openDevice,
+ .play = pulse_playAudio,
+ .cancel = pulse_dropBufferedAudio,
+ .close = pulse_closeDevice,
};
#else /* HAVE_PULSE */
diff --git a/src/audioOutputs/audioOutput_shout.c b/src/audioOutputs/audioOutput_shout.c
index feb4b4d8f..b55c06cc9 100644
--- a/src/audioOutputs/audioOutput_shout.c
+++ b/src/audioOutputs/audioOutput_shout.c
@@ -534,15 +534,14 @@ static void my_shout_set_tag(void *data,
}
const struct audio_output_plugin shoutPlugin = {
- "shout",
- NULL,
- my_shout_init_driver,
- my_shout_finish_driver,
- my_shout_open_device,
- my_shout_play,
- my_shout_drop_buffered_audio,
- my_shout_close_device,
- my_shout_set_tag,
+ .name = "shout",
+ .init = my_shout_init_driver,
+ .finish = my_shout_finish_driver,
+ .open = my_shout_open_device,
+ .play = my_shout_play,
+ .cancel = my_shout_drop_buffered_audio,
+ .close = my_shout_close_device,
+ .send_tag = my_shout_set_tag,
};
#else