aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/output/ao_plugin.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/src/output/ao_plugin.c b/src/output/ao_plugin.c
index 2c5d22a60..d7298fc02 100644
--- a/src/output/ao_plugin.c
+++ b/src/output/ao_plugin.c
@@ -36,7 +36,6 @@ typedef struct _AoData {
static AoData *newAoData(void)
{
AoData *ret = g_malloc(sizeof(AoData));
- ret->device = NULL;
ret->options = NULL;
return ret;
@@ -148,10 +147,7 @@ static void audioOutputAo_closeDevice(void *data)
{
AoData *ad = (AoData *)data;
- if (ad->device) {
- ao_close(ad->device);
- ad->device = NULL;
- }
+ ao_close(ad->device);
}
static bool
@@ -160,10 +156,6 @@ audioOutputAo_openDevice(void *data, struct audio_format *audio_format)
ao_sample_format format;
AoData *ad = (AoData *)data;
- if (ad->device) {
- audioOutputAo_closeDevice(ad);
- }
-
/* support for 24 bit samples in libao is currently dubious,
and until we have sorted that out, resample everything to
16 bit */
@@ -207,9 +199,6 @@ audioOutputAo_play(void *data, const void *chunk, size_t size)
{
AoData *ad = (AoData *)data;
- if (ad->device == NULL)
- return false;
-
if (size > ad->writeSize)
size = ad->writeSize;