output: moved code from audioOutput.c to output_control.c

Similar to decoder_control.c, output_control.c will provide functions
for controlling the output thread (which will be implemented later).

1 files changed, 123 insertions, 0 deletions

diff --git a/src/output_control.c b/src/output_control.c
new file mode 100644
index 000000000..a6a8cac74
--- /dev/null
+++ b/src/output_control.c
@@ -0,0 +1,123 @@
+/* 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 "output_control.h"
+#include "output_api.h"
+#include "pcm_utils.h"
+#include "utils.h"
+#include "audio.h"
+
+int openAudioOutput(struct audio_output *audioOutput,
+		    const struct audio_format *audioFormat)
+{
+	int ret = 0;
+
+	if (audioOutput->open &&
+	    0 == cmpAudioFormat(audioFormat, &audioOutput->inAudioFormat)) {
+		return 0;
+	}
+
+	copyAudioFormat(&audioOutput->inAudioFormat, audioFormat);
+
+	if (audioOutput->convertAudioFormat) {
+		copyAudioFormat(&audioOutput->outAudioFormat,
+		                &audioOutput->reqAudioFormat);
+	} else {
+		copyAudioFormat(&audioOutput->outAudioFormat,
+		                &audioOutput->inAudioFormat);
+		if (audioOutput->open)
+			closeAudioOutput(audioOutput);
+	}
+
+	if (!audioOutput->open)
+		ret = audioOutput->plugin->open(audioOutput);
+
+	audioOutput->sameInAndOutFormats =
+		!cmpAudioFormat(&audioOutput->inAudioFormat,
+		                &audioOutput->outAudioFormat);
+
+	return ret;
+}
+
+static void convertAudioFormat(struct audio_output *audioOutput,
+			       const char **chunkArgPtr, size_t *sizeArgPtr)
+{
+	size_t size = pcm_sizeOfConvBuffer(&(audioOutput->inAudioFormat),
+					   *sizeArgPtr,
+					   &(audioOutput->outAudioFormat));
+
+	if (size > audioOutput->convBufferLen) {
+		if (audioOutput->convBuffer != NULL)
+			free(audioOutput->convBuffer);
+		audioOutput->convBuffer = xmalloc(size);
+		audioOutput->convBufferLen = size;
+	}
+
+	*sizeArgPtr = pcm_convertAudioFormat(&(audioOutput->inAudioFormat), 
+	                                     *chunkArgPtr, *sizeArgPtr, 
+	                                     &(audioOutput->outAudioFormat),
+	                                     audioOutput->convBuffer,
+	                                     &audioOutput->convState);
+
+	*chunkArgPtr = audioOutput->convBuffer;
+}
+
+int playAudioOutput(struct audio_output *audioOutput,
+		    const char *playChunk, size_t size)
+{
+	int ret;
+
+	if (!audioOutput->open)
+		return -1;
+
+	if (!audioOutput->sameInAndOutFormats) {
+		convertAudioFormat(audioOutput, &playChunk, &size);
+	}
+
+	ret = audioOutput->plugin->play(audioOutput, playChunk, size);
+
+	return ret;
+}
+
+void dropBufferedAudioOutput(struct audio_output *audioOutput)
+{
+	if (audioOutput->open)
+		audioOutput->plugin->cancel(audioOutput);
+}
+
+void closeAudioOutput(struct audio_output *audioOutput)
+{
+	if (audioOutput->open)
+		audioOutput->plugin->close(audioOutput);
+}
+
+void finishAudioOutput(struct audio_output *audioOutput)
+{
+	closeAudioOutput(audioOutput);
+	if (audioOutput->plugin->finish)
+		audioOutput->plugin->finish(audioOutput);
+	if (audioOutput->convBuffer)
+		free(audioOutput->convBuffer);
+}
+
+void sendMetadataToAudioOutput(struct audio_output *audioOutput,
+			       const struct tag *tag)
+{
+	if (audioOutput->plugin->send_tag)
+		audioOutput->plugin->send_tag(audioOutput, tag);
+}