# HG changeset patch
# User Cristi Magherusan <majeru@atheme-project.org>
# Date 1186776395 -10800
# Node ID b01c8d41d35b59cefc5811965d5959ad44090101
# Parent  218bf0a3466247540ccb2583c65392ee57e13a6c# Parent  d4f6507cded3334579fc43cfc6bead276a3d1bcb
merge frenzy

diff -r d4f6507cded3 -r b01c8d41d35b src/audacious/Makefile
--- a/src/audacious/Makefile	Fri Aug 10 21:58:19 2007 +0200
+++ b/src/audacious/Makefile	Fri Aug 10 23:06:35 2007 +0300
@@ -37,6 +37,7 @@
 	auddrct.h \
 	configdb.h \
 	dbus.h \
+	discovery.h \
 	eventqueue.h \
 	formatter.h \
 	rcfile.h \
diff -r d4f6507cded3 -r b01c8d41d35b src/audacious/discovery.h
--- a/src/audacious/discovery.h	Fri Aug 10 21:58:19 2007 +0200
+++ b/src/audacious/discovery.h	Fri Aug 10 23:06:35 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 d4f6507cded3 -r b01c8d41d35b src/audacious/plugin.h
--- a/src/audacious/plugin.h	Fri Aug 10 21:58:19 2007 +0200
+++ b/src/audacious/plugin.h	Fri Aug 10 23:06:35 2007 +0300
@@ -313,7 +313,7 @@
     void (*cleanup) (void);
     void (*about) (void);
     void (*configure) (void);
-    gchar *(*get_devices);  
+    GList *(*get_devices);  
 };
 
 G_BEGIN_DECLS