# HG changeset patch
# User Cristi Magherusan <majeru@atheme-project.org>
# Date 1187973708 -10800
# Node ID f5e5e9653287282cf83e8ac5febf41684d5e4db8
# Parent  3fa4ee796bd11302f5284655dae99e41f6ea30de# Parent  30088b5ae4e4d57c8db5db3cfdf1ce8eb47ef5bd
merge

diff -r 30088b5ae4e4 -r f5e5e9653287 config.guess
diff -r 30088b5ae4e4 -r f5e5e9653287 config.rpath
diff -r 30088b5ae4e4 -r f5e5e9653287 config.sub
diff -r 30088b5ae4e4 -r f5e5e9653287 contrib/g15_audacious.py
diff -r 30088b5ae4e4 -r f5e5e9653287 install-sh
diff -r 30088b5ae4e4 -r f5e5e9653287 mkinstalldirs
diff -r 30088b5ae4e4 -r f5e5e9653287 src/audacious/Makefile
--- a/src/audacious/Makefile	Thu Aug 23 20:31:48 2007 -0500
+++ b/src/audacious/Makefile	Fri Aug 24 19:41:48 2007 +0300
@@ -38,6 +38,7 @@
 	configdb.h \
 	custom_uri.h \
 	dbus.h \
+	discovery.h \
 	dbus-service.h \
 	eventqueue.h \
 	formatter.h \
diff -r 30088b5ae4e4 -r f5e5e9653287 src/audacious/discovery.h
--- a/src/audacious/discovery.h	Thu Aug 23 20:31:48 2007 -0500
+++ b/src/audacious/discovery.h	Fri Aug 24 19:41:48 2007 +0300
@@ -32,6 +32,15 @@
     GList *enabled_list;
 };
 
+GList * discovery_devices;
+typedef struct _discovery_device_t discovery_device_t;
+struct _discovery_device_t {
+    gchar *device_name;     /*some kind of description*/
+    gchar *device_address;  /*some kind of device ID*/
+    GList *device_playlist; /*contains all the songs on the device*/
+};
+
+
 GList *get_discovery_list(void);
 GList *get_discovery_enabled_list(void);
 void enable_discovery_plugin(gint i, gboolean enable);
diff -r 30088b5ae4e4 -r f5e5e9653287 src/audacious/intl/config.charset
diff -r 30088b5ae4e4 -r f5e5e9653287 src/audacious/plugin.h
--- a/src/audacious/plugin.h	Thu Aug 23 20:31:48 2007 -0500
+++ b/src/audacious/plugin.h	Fri Aug 24 19:41:48 2007 +0300
@@ -313,7 +313,7 @@
     void (*cleanup) (void);
     void (*about) (void);
     void (*configure) (void);
-    gchar *(*get_devices);  
+    GList *(*get_devices);  
 };
 
 G_BEGIN_DECLS