changeset 3388:b01c8d41d35b

merge frenzy
author Cristi Magherusan <majeru@atheme-project.org>
date Fri, 10 Aug 2007 23:06:35 +0300
parents 218bf0a34662 (diff) d4f6507cded3 (current diff)
children c8d0d7bf26d4
files src/audacious/plugin.h
diffstat 3 files changed, 11 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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 \
--- 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);
--- 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