changeset 3394:f5e5e9653287

merge
author Cristi Magherusan <majeru@atheme-project.org>
date Fri, 24 Aug 2007 19:41:48 +0300
parents 3fa4ee796bd1 (diff) 30088b5ae4e4 (current diff)
children df609e7e7bcf
files
diffstat 3 files changed, 11 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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 \
--- 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);
--- 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