From e62580db0bab0650f088f9f45c66657d18dfb679 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Sun, 15 Mar 2009 03:32:34 +0100
Subject: httpd: new output plugin to replace "shout"

Let's get rid of the "shout" plugin, and the awfully complicated
icecast daemon setup!  MPD can do better if it's doing the HTTP server
stuff on its own.  This new plugin has several advantages:

- easier to set up - only one daemon, no password settings, no mount
  settings
- MPD controls the encoder and thus already knows the packet
  boundaries - icecast has to parse them
- MPD doesn't bother to encode data while nobody is listening

This implementation is very experimental (no header parsing, ignores
request URI, no icy-metadata, ...).  It should be able to suport
several encoders in parallel in the future (with different bit rates,
different codec, ...), to make MPD the perfect streaming server.  Once
MPD gets multi-player support, we can even mount several different
radio stations on one server.
---
 src/output/httpd_internal.h | 112 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 112 insertions(+)
 create mode 100644 src/output/httpd_internal.h

(limited to 'src/output/httpd_internal.h')

diff --git a/src/output/httpd_internal.h b/src/output/httpd_internal.h
new file mode 100644
index 00000000..d19909c8
--- /dev/null
+++ b/src/output/httpd_internal.h
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2003-2009 The Music Player Daemon Project
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/** \file
+ *
+ * Internal declarations for the "httpd" audio output plugin.
+ */
+
+#ifndef MPD_OUTPUT_HTTPD_INTERNAL_H
+#define MPD_OUTPUT_HTTPD_INTERNAL_H
+
+#include "timer.h"
+
+#include <glib.h>
+
+#include <sys/socket.h>
+
+struct httpd_client;
+
+struct httpd_output {
+	/**
+	 * The configured encoder plugin.
+	 */
+	struct encoder *encoder;
+
+	/**
+	 * The MIME type produced by the #encoder.
+	 */
+	const char *content_type;
+
+	/**
+	 * The configured address of the listener socket.
+	 */
+	struct sockaddr_storage address;
+
+	/**
+	 * The size of #address.
+	 */
+	socklen_t address_size;
+
+	/**
+	 * This mutex protects the listener socket and the client
+	 * list.
+	 */
+	GMutex *mutex;
+
+	/**
+	 * A #Timer object to synchronize this output with the
+	 * wallclock.
+	 */
+	Timer *timer;
+
+	/**
+	 * The listener socket.
+	 */
+	int fd;
+
+	/**
+	 * A GLib main loop source id for the listener socket.
+	 */
+	guint source_id;
+
+	/**
+	 * The header page, which is sent to every client on connect.
+	 */
+	struct page *header;
+
+	/**
+	 * A linked list containing all clients which are currently
+	 * connected.
+	 */
+	GList *clients;
+
+	/**
+	 * A temporary buffer for the httpd_output_read_page()
+	 * function.
+	 */
+	char buffer[32768];
+};
+
+/**
+ * Removes a client from the httpd_output.clients linked list.
+ */
+void
+httpd_output_remove_client(struct httpd_output *httpd,
+			   struct httpd_client *client);
+
+/**
+ * Sends the encoder header to the client.  This is called right after
+ * the response headers have been sent.
+ */
+void
+httpd_output_send_header(struct httpd_output *httpd,
+			 struct httpd_client *client);
+
+#endif
-- 
cgit v1.2.3