changeset 3741:a1b31fe5a249

export ip_data and cfg
author William Pitcock <nenolod@atheme.org>
date Sat, 13 Oct 2007 23:43:45 -0500
parents 240669919716
children e7caa4d49d74
files src/audacious/input.h src/audacious/plugin.h src/audacious/pluginenum.c
diffstat 3 files changed, 12 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/audacious/input.h	Sat Oct 13 23:29:35 2007 -0500
+++ b/src/audacious/input.h	Sat Oct 13 23:43:45 2007 -0500
@@ -26,9 +26,9 @@
 #ifndef _AUDACIOUS_INPUT_H
 #define _AUDACIOUS_INPUT_H
 
-#include "plugin.h"
+typedef struct _InputPluginData InputPluginData;
 
-typedef struct _InputPluginData InputPluginData;
+#include "plugin.h"
 
 struct _InputPluginData {
     GList *input_list;
--- a/src/audacious/plugin.h	Sat Oct 13 23:29:35 2007 -0500
+++ b/src/audacious/plugin.h	Sat Oct 13 23:43:45 2007 -0500
@@ -43,6 +43,7 @@
 #include "audacious/eventqueue.h"
 #include "audacious/configdb.h"
 #include "audacious/playlist_container.h"
+#include "audacious/main.h"
 
 #define PLUGIN(x)         ((Plugin *)(x))
 #define INPUT_PLUGIN(x)   ((InputPlugin *)(x))
@@ -434,6 +435,9 @@
 
     gboolean (*playlist_playlists_equal)(Playlist *p1, Playlist *p2);
 
+    /* state vars */
+    InputPluginData *ip_state;
+    BmpConfig *_cfg;
 };
 
 /* Convenience macros for accessing the public API. */
@@ -649,6 +653,9 @@
 #define aud_playlist_get_active			_audvt->playlist_get_active
 #define aud_playlist_playlists_equal		_audvt->playlist_playlists_equal
 
+#define aud_ip_state				_audvt->ip_state
+#define aud_cfg					_audvt->_cfg
+
 /* for multi-file plugins :( */
 extern struct _AudaciousFuncTableV1 *_audvt;
 
--- a/src/audacious/pluginenum.c	Sat Oct 13 23:29:35 2007 -0500
+++ b/src/audacious/pluginenum.c	Sat Oct 13 23:43:45 2007 -0500
@@ -259,6 +259,9 @@
 
     .playlist_get_active = playlist_get_active,
     .playlist_playlists_equal = playlist_playlists_equal,
+
+    .ip_state = &ip_data,
+    ._cfg = &cfg,
 };
 
 /*****************************************************************/