OpenHome services

.gitignore

@@ -0,0 +1,3 @@
+*~
+*.o
+*.in

README.md

@@ -34,13 +34,13 @@ gstreamer 0.10 up to 1.0.7. There was a [leaking thread bug][gst-bug-699794]
 whose fix showed up in GStreamer 1.0.8.
 If you are using an older version, then only restart of gmrender-resurrect
 helps in these situations.
-Unfortunately, in  gstreamer 1.0.x version, there is another bug, a
-[race condition][gst-bug-698750], that affects gapless playing with some
-file formats (FLAC is ok, OGG has trouble), but apparantly, this is being
-fixed in the development version of gstreamer (not verified yet).
+There is a [bug][gst-bug-698750] before gstreamer 1.2 that affects gapless
+playback.
+
+Bottomline: use at least gstreamer 1.2.
 
 If you want to use OpenMAX support, [there are reports][open-max-support], that
-this works with a recent version of gstreamer 1.0.9.
+this works with a recent version of gstreamer >= 1.0.9.
 
 Installation
 ------------

src/Makefile.am

@@ -11,7 +11,16 @@ gmediarender_SOURCES = main.c git-version.h \
 	output.c output.h \
 	logging.h logging.c \
 	xmldoc.c xmldoc.h \
-	xmlescape.c xmlescape.h
+	xmlescape.c xmlescape.h \
+	mime_types.c mime_types.h \
+	oh_playlist.c oh_playlist.h \
+	oh_info.c oh_info.h \
+	oh_time.c oh_time.h \
+	oh_product.c oh_product.h \
+	oh_volume.c oh_volume.h \
+	oh_source.c oh_source.h \
+	playlist.c playlist.h \
+	shared_metadata.c shared_metadata.h
 
 if HAVE_GST
 gmediarender_SOURCES += \

src/main.c

@@ -54,6 +54,12 @@
 #include "upnp_device.h"
 #include "upnp_renderer.h"
 #include "upnp_transport.h"
+#include "oh_playlist.h"
+#include "oh_info.h"
+#include "oh_time.h"
+#include "oh_product.h"
+#include "oh_volume.h"
+#include "oh_source.h"
 
 static gboolean show_version = FALSE;
 static gboolean show_devicedesc = FALSE;
@@ -62,6 +68,9 @@ static gboolean show_control_scpd = FALSE;
 static gboolean show_transport_scpd = FALSE;
 static gboolean show_outputs = FALSE;
 static gboolean daemon_mode = FALSE;
+static gboolean openhome_mode = FALSE;
+
+static gchar *playlist_file = NULL;
 
 // IP-address seems strange in libupnp: they actually don't bind to
 // that address, but to INADDR_ANY (miniserver.c in upnp library).
@@ -85,6 +94,10 @@ static const gchar *log_file = NULL;
 static GOptionEntry option_entries[] = {
 	{ "version", 0, 0, G_OPTION_ARG_NONE, &show_version,
 	  "Output version information and exit", NULL },
+	{ "openhome", 0, 0, G_OPTION_ARG_NONE, &openhome_mode,
+	  "Device mode (upnpav or openhome, defaults to upnpav)", NULL },
+	{ "playlist", 0, 0, G_OPTION_ARG_STRING, &playlist_file,
+	  "Filename to store playlist in OpenHome mode", NULL },
 	{ "ip-address", 'I', 0, G_OPTION_ARG_STRING, &ip_address,
 	  "The local IP address the service is running and advertised "
 	  "(only one, 0.0.0.0 won't work)", NULL },
@@ -190,7 +203,7 @@ static void init_logging(const char *log_file) {
 int main(int argc, char **argv)
 {
 	int rc;
-	struct upnp_device_descriptor *upnp_renderer;
+	struct upnp_device_descriptor *device_desc;
 
 	if (!process_cmdline(argc, argv)) {
 		return EXIT_FAILURE;
@@ -219,6 +232,7 @@ int main(int argc, char **argv)
 	}
 
 	init_logging(log_file);
+	variable_container_init();
 
 	// Now we're going to start threads etc, which means we need
 	// to become a daemon before that.
@@ -244,8 +258,11 @@ int main(int argc, char **argv)
 	}
 #endif
 
-	upnp_renderer = upnp_renderer_descriptor(friendly_name, uuid);
-	if (upnp_renderer == NULL) {
+	if (!openhome_mode)
+		device_desc = upnp_renderer_descriptor(friendly_name, uuid);
+	else
+		device_desc = oh_source_descriptor(friendly_name, uuid);
+	if (device_desc == NULL) {
 		return EXIT_FAILURE;
 	}
 
@@ -256,6 +273,9 @@ int main(int argc, char **argv)
 		return EXIT_FAILURE;
 	}
 
+	if (openhome_mode && playlist_file != NULL)
+		oh_playlist_load(playlist_file);
+
 	struct upnp_device *device;
 	if (listen_port != 0 &&
 	    (listen_port < 49152 || listen_port > 65535)) {
@@ -268,25 +288,33 @@ int main(int argc, char **argv)
 			  listen_port);
 		return EXIT_FAILURE;
 	}
-	device = upnp_device_init(upnp_renderer, ip_address, listen_port);
+	device = upnp_device_init(device_desc, ip_address, listen_port);
 	if (device == NULL) {
 		Log_error("main", "ERROR: Failed to initialize UPnP device");
 		return EXIT_FAILURE;
 	}
 
-	upnp_transport_init(device);
-	upnp_control_init(device);
+	if (!openhome_mode) {
+		upnp_transport_init(device);
+		upnp_control_init(device);
+	} else {
+		oh_product_init(device);
+		oh_playlist_init(device);
+		oh_info_init(device);
+		oh_time_init(device);
+		oh_volume_init(device);
+	}
 
 	if (show_devicedesc) {
 		// This can only be run after all services have been
 		// initialized.
-		char *buf = upnp_create_device_desc(upnp_renderer);
+		char *buf = upnp_create_device_desc(device_desc);
 		assert(buf != NULL);
 		fputs(buf, stdout);
 		exit(EXIT_SUCCESS);
 	}
 
-	if (Log_info_enabled()) {
+	if (!openhome_mode && Log_info_enabled()) {
 		upnp_transport_register_variable_listener(log_variable_change,
 							  (void*) "transport");
 		upnp_control_register_variable_listener(log_variable_change,

src/mime_types.c

@@ -0,0 +1,145 @@
+/* mime_types.c - MIME types utils
+ *
+ * Copyright (C) 2005-2007   Ivo Clarysse
+ * Copyright (C) 2013 Andrey Demenev
+ *
+ * This file is part of GMediaRender.
+ *
+ * GMediaRender 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.
+ *
+ * GMediaRender 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 Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GMediaRender; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <assert.h>
+#include <stdio.h>
+
+#include "mime_types.h"
+#include "logging.h"
+
+static struct mime_type *supported_types = NULL;
+
+struct mime_type *get_supported_mime_types(void)
+{
+	return supported_types;
+}
+
+static void register_mime_type_internal(const char *mime_type) {
+	struct mime_type *entry;
+
+	for (entry = supported_types; entry; entry = entry->next) {
+		if (strcmp(entry->mime_type, mime_type) == 0) {
+			return;
+		}
+	}
+	Log_info("mimetypes", "Registering support for '%s'", mime_type);
+
+	entry = malloc(sizeof(struct mime_type));
+	entry->mime_type = strdup(mime_type);
+	entry->next = supported_types;
+	supported_types = entry;
+}
+
+void register_mime_type(const char *mime_type) {
+	register_mime_type_internal(mime_type);
+	if (strcmp("audio/mpeg", mime_type) == 0) {
+		register_mime_type_internal("audio/x-mpeg");
+
+		// BubbleUPnP does not seem to match generic "audio/*" types,
+		// but only matches mime-types _exactly_, so we add some here.
+		// TODO(hzeller): we already add the "audio/*" mime-type
+		// output_gstream.c:scan_caps() which should just work once
+		// BubbleUPnP allows for  matching "audio/*". Remove the code
+		// here.
+
+		// BubbleUPnP uses audio/x-scpl as an indicator to know if the
+		// renderer can handle it (otherwise it will proxy).
+		// Simple claim: if we can handle mpeg, then we can handle
+		// shoutcast.
+		// (For more accurate answer: we'd to check if all of
+		// mpeg, aac, aacp, ogg are supported).
+		register_mime_type_internal("audio/x-scpls");
+
+		// This is apparently something sent by the spotifyd
+		// https://gitorious.org/spotifyd
+		register_mime_type("audio/L16;rate=44100;channels=2");
+	}
+
+	// Some workaround: some controllers seem to match the version without
+	// x-, some with; though the mime-type is correct with x-, these formats
+	// seem to be common enough to sometimes be used without.
+	// If this works, we should probably collect all of these
+	// in a set emit always both, foo/bar and foo/x-bar, as it is a similar
+	// work-around as seen above with mpeg -> x-mpeg.
+	if (strcmp("audio/x-alac", mime_type) == 0) {
+	  register_mime_type_internal("audio/alac");
+	}
+	if (strcmp("audio/x-aiff", mime_type) == 0) {
+	  register_mime_type_internal("audio/aiff");
+	}
+	if (strcmp("audio/x-m4a", mime_type) == 0) {
+	  register_mime_type_internal("audio/m4a");
+	  register_mime_type_internal("audio/mp4");
+	}
+}
+
+char *get_mime_protocol_info(void)
+{
+	struct mime_type *entry;
+	char *buf = NULL;
+	char *p;
+	int offset;
+	int bufsize = 0;
+	buf = malloc(bufsize);
+	p = buf;
+	assert(buf);  // We assume an implementation that does 0-mallocs.
+	if (buf == NULL) {
+		fprintf(stderr, "%s: initial malloc failed\n",
+			__FUNCTION__);
+		return NULL;
+	}
+
+	for (entry = get_supported_mime_types(); entry; entry = entry->next) {
+		bufsize += strlen(entry->mime_type) + 1 + 8 + 3 + 2;
+		offset = p - buf;
+		buf = realloc(buf, bufsize);
+		if (buf == NULL) {
+			fprintf(stderr, "%s: realloc failed\n",
+				__FUNCTION__);
+			return NULL;
+		}
+		p = buf;
+		p += offset;
+		strncpy(p, "http-get:*:", 11);
+		p += 11;
+		strncpy(p, entry->mime_type, strlen(entry->mime_type));
+		p += strlen(entry->mime_type);
+		strncpy(p, ":*,", 3);
+		p += 3;
+	}
+	if (p > buf) {
+		p--;
+		*p = '\0';
+	}
+	*p = '\0';
+	return buf;
+}
+

src/mime_types.h

@@ -0,0 +1,38 @@
+/* mime_types.h - MIME types utils
+ *
+ * Copyright (C) 2005-2007   Ivo Clarysse
+ * Copyright (C) 2013 Andrey Demenev
+ *
+ * This file is part of GMediaRender.
+ *
+ * GMediaRender 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.
+ *
+ * GMediaRender 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 Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GMediaRender; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ */
+
+#ifndef _MIME_TYPES_H
+#define _MIME_TYPES_H
+
+struct mime_type {
+	const char *mime_type;
+	struct mime_type *next;
+};
+
+struct mime_type *get_supported_mime_types(void);
+void register_mime_type(const char *mime_type);
+char *get_mime_protocol_info(void);
+
+#endif
+