Add gstreamer to gdml

Fix wildcard certificate host check

Makefile.am

@@ -100,8 +100,8 @@ dml_fprs_db_LDFLAGS = -leth_ar -lm
 if ENABLE_GDML
 
 bin_PROGRAMS += gdml
-gdml_CFLAGS = @GTK_CFLAGS@
+gdml_CFLAGS = @GTK_CFLAGS@ @GSTREAMER_CFLAGS@
 gdml_LDADD = libdml.la
-gdml_LDFLAGS = @GTK_LIBS@
+gdml_LDFLAGS = @GTK_LIBS@ @GSTREAMER_LIBS@
 
 endif

configure.ac

@@ -101,6 +101,9 @@ PKG_CHECK_MODULES([GLIB], [glib-2.0])
 # gtk+
 PKG_CHECK_MODULES([GTK], [gtk+-3.0], [GTK_FOUND=yes], [GTK_FOUND=no])
 
+# gstreamer
+PKG_CHECK_MODULES([GSTREAMER], [gstreamer-1.0 >= 1.4], [GSTREAMER_FOUND=yes], [GSTREAMER_FOUND=no])
+
 
 # build selection logic
 
@@ -113,7 +116,7 @@ AS_IF([test "x$EMSCRIPTEN_FOUND" = "xno" ],
 	[enable_dml_trx="no"; enable_dml_reflector="no" ]
 )
 
-AS_IF([test "x$GTK_FOUND" = "xyes" ], [enable_gdml="yes"], [enable_gdml="no"])
+AS_IF([test "x$GTK_FOUND" = "xyes" && test "x$GSTREAMER_FOUND" = "xyes"], [enable_gdml="yes"], [enable_gdml="no"])
 
 
 AM_CONDITIONAL(ENABLE_DML_HTTPD, test "x$enable_dml_httpd" = "xyes")

dml_config.c

@@ -185,3 +185,19 @@ char *dml_config_value(char *key, char *prev_value, char *def)
 	
 	return def;
 }
+
+void dml_config_set(char *key, char *value)
+{
+	struct dml_config **ep;
+	struct dml_config *entry;
+	
+	for (ep = &config_list; *ep; ep = &(*ep)->next) {
+		entry = *ep;
+		if (!strcmp(entry->key, key)) {
+			free(entry->value);
+			entry->value = strdup(value);
+			return;
+		}
+	}
+	dml_config_add(key, value);
+}

dml_config.h

@@ -27,4 +27,7 @@ int dml_config_save(char *file);
 
 char *dml_config_value(char *key, char *prev_value, char *def);
 
+/* set a (unique) value */
+void dml_config_set(char *key, char *value);
+
 #endif /* _INCLUDE_DML_CONFIG_H_ */

dml_crypto.c

@@ -144,7 +144,7 @@ int dml_crypto_cert_add_verify(void *certdata, size_t size, uint8_t id[DML_ID_SI
 	name = dml_stream_name_get(ds);
 	if (!name)
 		goto err_name;
-	rc = X509_check_host(cert, name, 0, 0, NULL);
+	rc = X509_check_host(cert, name, 0, X509_CHECK_FLAG_ALWAYS_CHECK_SUBJECT, NULL);
 //	fprintf(stderr, "check host rc: %d\n", rc);
 	
 	struct dml_crypto_key *dk = dml_stream_crypto_get(ds);

gdml.c

@@ -19,16 +19,34 @@
 #include <dml/dml_host.h>
 #include <dml_config.h>
 
+#include <gst/gst.h>
+
 #include <gtk/gtk.h>
 
+#define debug(...) printf(__VA_ARGS__)
+
 static GtkWidget *window;
 static GtkWidget *streamlist;
 
+GtkWidget *combo_audio_sink;
+
 struct dml_stream_priv {
 	GtkWidget *label;
 };
 
 
+struct device_list {
+	GstDevice *device;
+	
+	char *name;
+	
+	struct device_list *next;
+};
+
+struct device_list *devices_audio_sink = NULL;
+
+
+
 gint streamlist_sort(GtkListBoxRow *row1, GtkListBoxRow *row2, gpointer user_data)
 {
 	/* Do a sort based on domain, so alphabetical, but working backwards per dot. */
@@ -95,7 +113,7 @@ static void stream_added_cb(struct dml_host *host, struct dml_stream *ds, void *
 	gtk_container_add(GTK_CONTAINER(streamlist), row);
 	gtk_widget_show_all(window);
 	
-	printf("%s\n", lstr);
+	debug("%s\n", lstr);
 	free(lstr);
 }
 
@@ -109,9 +127,78 @@ void stream_removed_cb(struct dml_host *host, struct dml_stream *ds, void *arg)
 }
 
 
+void receive_clicked(GtkButton *button, gpointer data)
+{
+	GtkListBoxRow *selrow = gtk_list_box_get_selected_row(GTK_LIST_BOX(streamlist));
+	if (!selrow) {
+		debug("nothing selected\n");
+		return;
+	}
+	
+	struct dml_stream *ds = g_object_get_data(G_OBJECT(selrow), "dml_stream");
+	char *name = dml_stream_name_get(ds);
+	debug("Selected: %s\n", name);
+}
+
+void connect_clicked(GtkButton *button, gpointer data)
+{
+	GtkListBoxRow *selrow = gtk_list_box_get_selected_row(GTK_LIST_BOX(streamlist));
+	if (!selrow) {
+		debug("nothing selected\n");
+		return;
+	}
+	
+	struct dml_stream *ds = g_object_get_data(G_OBJECT(selrow), "dml_stream");
+	char *name = dml_stream_name_get(ds);
+	debug("Selected: %s\n", name);
+}
+
+static void device_changed(void)
+{
+	gchar *active_name = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT(combo_audio_sink));
+	if (active_name) {
+		dml_config_set("device_audio_sink", active_name);
+	}
+	g_free(active_name);
+}
+
+static void device_update_list(void)
+{
+	struct device_list *entry;
+	int active = -1;
+	
+	char *config_name = dml_config_value("device_audio_sink", NULL, NULL);
+
+	gtk_combo_box_text_remove_all(GTK_COMBO_BOX_TEXT(combo_audio_sink));
+
+	int i;
+	for (i = 0, entry = devices_audio_sink; entry; entry = entry->next, i++) {
+		gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(combo_audio_sink), NULL, entry->name);
+		if (config_name && !strcmp(config_name, entry->name)) {
+			active = i;
+		}
+	}
+	if (active >= 0) {
+		gtk_combo_box_set_active(GTK_COMBO_BOX(combo_audio_sink), active);
+	}
+	gtk_widget_show_all(combo_audio_sink);
+}
+
 
 int create_window(int *argc, char ***argv)
 {
+	/*
+	   +------------------------------------+
+	   |            hbox                    |
+	   | +------------+ +-----------------+ |
+	   | | controlbox | |  streamscroll   | |
+	   | |            | | +-------------+ | |
+	   | |            | | |  streamlist | | |
+	   | |            | | +-------------+ | |
+	   | +------------+ +-----------------+ |
+	   +------------------------------------+
+	
+	*/
 	gtk_init(argc, argv);
 
 	/* Create the main, top level window */
@@ -123,14 +210,117 @@ int create_window(int *argc, char ***argv)
 
 	g_signal_connect(window, "destroy", G_CALLBACK(gtk_main_quit), NULL);
 
+	GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+	GtkWidget *controlbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+
+
 	streamlist = gtk_list_box_new();
 	gtk_list_box_set_sort_func (GTK_LIST_BOX(streamlist), streamlist_sort, NULL, NULL);
 	
 	GtkWidget *streamscroll = gtk_scrolled_window_new(NULL, NULL);
 	gtk_container_add(GTK_CONTAINER(streamscroll), streamlist);
-	gtk_container_add(GTK_CONTAINER(window), streamscroll);
+	
+	gtk_box_pack_end (GTK_BOX(hbox), streamscroll, true, true, 0);
+
+
+
+	GtkWidget *button_receive = gtk_button_new_with_label("Receive");
+	g_signal_connect (button_receive, "clicked", G_CALLBACK(connect_clicked), NULL);
+	
+	gtk_box_pack_start (GTK_BOX(controlbox), button_receive, false, false, 0);
+
+
+	GtkWidget *button_connect = gtk_button_new_with_label("Connect");
+	g_signal_connect (button_connect, "clicked", G_CALLBACK(connect_clicked), NULL);
+	
+	gtk_box_pack_start (GTK_BOX(controlbox), button_connect, false, false, 0);
+
+
+	GtkWidget *label = gtk_label_new("Audio sink");
+	gtk_box_pack_start (GTK_BOX(controlbox), label, false, false, 0);
+	
+	combo_audio_sink = gtk_combo_box_text_new();
+	g_signal_connect(combo_audio_sink, "changed", G_CALLBACK(device_changed), NULL);
+	gtk_box_pack_start (GTK_BOX(controlbox), combo_audio_sink, false, false, 0);
+	
+
+	gtk_box_pack_start (GTK_BOX(hbox), controlbox, false, false, 0);
+
+	gtk_container_add(GTK_CONTAINER(window), hbox);
+	
+	gtk_widget_show_all(window);
+	
+	debug("window created\n");
+	return 0;
+}
+
+
+static gboolean gst_monitor_cb(GstBus *bus, GstMessage *message, gpointer user_data)
+{
+	GstDevice *device;
+
+	switch (GST_MESSAGE_TYPE (message)) {
+		case GST_MESSAGE_DEVICE_ADDED:
+			gst_message_parse_device_added(message, &device);
+			gchar *class = gst_device_get_device_class(device);
+			debug("Device added: %p, class: '%s'\n", device, class);
+
+			if (!strcmp(class, "Audio/Sink")) {
+				debug("Add audio sink\n");
+				struct device_list *entry = calloc(1, sizeof(struct device_list));
+				struct device_list **end;
+				if (!entry)
+					break;
+
+				entry->name = gst_device_get_display_name(device);
+				entry->device = device;
+				for (end = &devices_audio_sink; *end; end = &(*end)->next);
+				*end = entry;
+			
+				device_update_list();
+			}
+
+			g_free(class);
+			break;
+		case GST_MESSAGE_DEVICE_REMOVED: {
+			gst_message_parse_device_removed (message, &device);
+			debug("Device removed: %p\n", device);
+			
+			struct device_list **ep;
+			for (ep = &devices_audio_sink; *ep; ep = &(*ep)->next) {
+				if ((*ep)->device == device) {
+					struct device_list *entry = *ep;
+					g_free(entry->name);
+					*ep = entry->next;
+					free(entry);
+					device_update_list();
+					break;
+				}
+			}
+			
+			break;
+		}
+		default:
+			break;
+	}
 
-	gtk_widget_show_all(streamscroll);
+	return G_SOURCE_CONTINUE;
+}
+
+int create_media(int *argc, char ***argv)
+{
+	gst_init(argc, argv);
+	
+	GstDeviceMonitor *gst_mon = gst_device_monitor_new();
+	
+	GstBus *gst_mon_bus = gst_device_monitor_get_bus(gst_mon);
+
+	gst_bus_add_watch(gst_mon_bus, gst_monitor_cb, NULL);
+	gst_object_unref(gst_mon_bus);
+
+	if (!gst_device_monitor_start(gst_mon)) {
+		debug("Could not start device monitor\n");
+	}
 	
 	return 0;
 }
@@ -139,20 +329,23 @@ int main (int argc, char **argv)
 {
 	create_window(&argc, &argv);
 
+	create_media(&argc, &argv);
+
 	struct dml_host *host;
 
 	host = dml_host_create(NULL);
 	if (!host) {
-		printf("Could not create host\n");
+		debug("Could not create host\n");
 		return -1;
 	}
 
 	dml_host_stream_added_cb_set(host, stream_added_cb, NULL);
 	dml_host_stream_removed_cb_set(host, stream_removed_cb, NULL);
 
+	debug("Start main loop\n");
 	gtk_main();
 
-	printf("Saving config\n");
+	debug("Saving config\n");
 	dml_config_save(NULL);
 
 	return 0;