Re-tagging 0.13.0 release to fix a couple of bugs with the tarball.

git-svn-id: https://svn.musicpd.org/mpd/tags/release-0.13.0@6325 09075e82-0dd4-0310-85a5-a0d7c8717e4f

1 files changed, 246 insertions, 0 deletions

diff --git a/trunk/src/audioOutputs/audioOutput_ao.c b/trunk/src/audioOutputs/audioOutput_ao.c
new file mode 100644
index 000000000..a7f437ef4
--- /dev/null
+++ b/trunk/src/audioOutputs/audioOutput_ao.c
@@ -0,0 +1,246 @@
+/* the Music Player Daemon (MPD)
+ * Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com)
+ * This project's homepage is: http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "../audioOutput.h"
+
+#ifdef HAVE_AO
+
+#include "../conf.h"
+#include "../log.h"
+
+#include <string.h>
+
+#include <ao/ao.h>
+
+static int driverInitCount;
+
+typedef struct _AoData {
+	int writeSize;
+	int driverId;
+	ao_option *options;
+	ao_device *device;
+} AoData;
+
+static AoData *newAoData(void)
+{
+	AoData *ret = xmalloc(sizeof(AoData));
+	ret->device = NULL;
+	ret->options = NULL;
+
+	return ret;
+}
+
+static void audioOutputAo_error(void)
+{
+	if (errno == AO_ENOTLIVE) {
+		ERROR("not a live ao device\n");
+	} else if (errno == AO_EOPENDEVICE) {
+		ERROR("not able to open audio device\n");
+	} else if (errno == AO_EBADOPTION) {
+		ERROR("bad driver option\n");
+	}
+}
+
+static int audioOutputAo_initDriver(AudioOutput * audioOutput,
+				    ConfigParam * param)
+{
+	ao_info *ai;
+	char *dup;
+	char *stk1;
+	char *stk2;
+	char *n1;
+	char *key;
+	char *value;
+	char *test;
+	AoData *ad = newAoData();
+	BlockParam *blockParam;
+
+	audioOutput->data = ad;
+
+	if ((blockParam = getBlockParam(param, "write_size"))) {
+		ad->writeSize = strtol(blockParam->value, &test, 10);
+		if (*test != '\0') {
+			FATAL("\"%s\" is not a valid write size at line %i\n",
+			      blockParam->value, blockParam->line);
+		}
+	} else
+		ad->writeSize = 1024;
+
+	if (driverInitCount == 0) {
+		ao_initialize();
+	}
+	driverInitCount++;
+
+	blockParam = getBlockParam(param, "driver");
+
+	if (!blockParam || 0 == strcmp(blockParam->value, "default")) {
+		ad->driverId = ao_default_driver_id();
+	} else if ((ad->driverId = ao_driver_id(blockParam->value)) < 0) {
+		FATAL("\"%s\" is not a valid ao driver at line %i\n",
+		      blockParam->value, blockParam->line);
+	}
+
+	if ((ai = ao_driver_info(ad->driverId)) == NULL) {
+		FATAL("problems getting driver info for device defined at line %i\n"
+		      "you may not have permission to the audio device\n", param->line);
+	}
+
+	DEBUG("using ao driver \"%s\" for \"%s\"\n", ai->short_name,
+	      audioOutput->name);
+
+	blockParam = getBlockParam(param, "options");
+
+	if (blockParam) {
+		dup = xstrdup(blockParam->value);
+	} else
+		dup = xstrdup("");
+
+	if (strlen(dup)) {
+		stk1 = NULL;
+		n1 = strtok_r(dup, ";", &stk1);
+		while (n1) {
+			stk2 = NULL;
+			key = strtok_r(n1, "=", &stk2);
+			if (!key)
+				FATAL("problems parsing options \"%s\"\n", n1);
+			/*found = 0;
+			   for(i=0;i<ai->option_count;i++) {
+			   if(strcmp(ai->options[i],key)==0) {
+			   found = 1;
+			   break;
+			   }
+			   }
+			   if(!found) {
+			   FATAL("\"%s\" is not an option for "
+			   "\"%s\" ao driver\n",key,
+			   ai->short_name);
+			   } */
+			value = strtok_r(NULL, "", &stk2);
+			if (!value)
+				FATAL("problems parsing options \"%s\"\n", n1);
+			ao_append_option(&ad->options, key, value);
+			n1 = strtok_r(NULL, ";", &stk1);
+		}
+	}
+	free(dup);
+
+	return 0;
+}
+
+static void freeAoData(AoData * ad)
+{
+	ao_free_options(ad->options);
+	free(ad);
+}
+
+static void audioOutputAo_finishDriver(AudioOutput * audioOutput)
+{
+	AoData *ad = (AoData *) audioOutput->data;
+	freeAoData(ad);
+
+	driverInitCount--;
+
+	if (driverInitCount == 0)
+		ao_shutdown();
+}
+
+static void audioOutputAo_dropBufferedAudio(AudioOutput * audioOutput)
+{
+	/* not supported by libao */
+}
+
+static void audioOutputAo_closeDevice(AudioOutput * audioOutput)
+{
+	AoData *ad = (AoData *) audioOutput->data;
+
+	if (ad->device) {
+		ao_close(ad->device);
+		ad->device = NULL;
+	}
+
+	audioOutput->open = 0;
+}
+
+static int audioOutputAo_openDevice(AudioOutput * audioOutput)
+{
+	ao_sample_format format;
+	AoData *ad = (AoData *) audioOutput->data;
+
+	if (ad->device) {
+		audioOutputAo_closeDevice(audioOutput);
+	}
+
+	format.bits = audioOutput->outAudioFormat.bits;
+	format.rate = audioOutput->outAudioFormat.sampleRate;
+	format.byte_format = AO_FMT_NATIVE;
+	format.channels = audioOutput->outAudioFormat.channels;
+
+	ad->device = ao_open_live(ad->driverId, &format, ad->options);
+
+	if (ad->device == NULL)
+		return -1;
+
+	audioOutput->open = 1;
+
+	return 0;
+}
+
+static int audioOutputAo_play(AudioOutput * audioOutput, char *playChunk,
+			      int size)
+{
+	int send;
+	AoData *ad = (AoData *) audioOutput->data;
+
+	if (ad->device == NULL)
+		return -1;
+
+	while (size > 0) {
+		send = ad->writeSize > size ? size : ad->writeSize;
+
+		if (ao_play(ad->device, playChunk, send) == 0) {
+			audioOutputAo_error();
+			ERROR("closing audio device due to write error\n");
+			audioOutputAo_closeDevice(audioOutput);
+			return -1;
+		}
+
+		playChunk += send;
+		size -= send;
+	}
+
+	return 0;
+}
+
+AudioOutputPlugin aoPlugin = {
+	"ao",
+	NULL,
+	audioOutputAo_initDriver,
+	audioOutputAo_finishDriver,
+	audioOutputAo_openDevice,
+	audioOutputAo_play,
+	audioOutputAo_dropBufferedAudio,
+	audioOutputAo_closeDevice,
+	NULL,	/* sendMetadataFunc */
+};
+
+#else
+
+#include <stdio.h>
+
+DISABLED_AUDIO_OUTPUT_PLUGIN(aoPlugin)
+#endif