changeset 3391:0afbafec6cd8

merge
author Cristi Magherusan <majeru@atheme-project.org>
date Mon, 13 Aug 2007 02:18:04 +0300
parents 3a77e835874f (diff) 71d8d93f1bad (current diff)
children d538aabf6df5
files
diffstat 3 files changed, 11 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/audacious/Makefile	Sun Aug 12 16:10:45 2007 -0700
+++ b/src/audacious/Makefile	Mon Aug 13 02:18:04 2007 +0300
@@ -38,6 +38,7 @@
 	configdb.h \
 	custom_uri.h \
 	dbus.h \
+	discovery.h \
 	eventqueue.h \
 	formatter.h \
 	rcfile.h \
--- a/src/audacious/discovery.h	Sun Aug 12 16:10:45 2007 -0700
+++ b/src/audacious/discovery.h	Mon Aug 13 02:18:04 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);
--- a/src/audacious/plugin.h	Sun Aug 12 16:10:45 2007 -0700
+++ b/src/audacious/plugin.h	Mon Aug 13 02:18:04 2007 +0300
@@ -313,7 +313,7 @@
     void (*cleanup) (void);
     void (*about) (void);
     void (*configure) (void);
-    gchar *(*get_devices);  
+    GList *(*get_devices);  
 };
 
 G_BEGIN_DECLS