Mercurial > hg > xmms-sid
diff src/xs_support.h @ 611:a751d2b85a7d
Merge in Tuple changes from Audacious-SID.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Sat, 01 Sep 2007 14:43:05 +0000 |
| parents | 3982cba928f2 |
| children | 6f9c5bb127e6 |
line wrap: on
line diff
--- a/src/xs_support.h Sat Sep 01 14:43:01 2007 +0000 +++ b/src/xs_support.h Sat Sep 01 14:43:05 2007 +0000 @@ -15,10 +15,13 @@ #ifdef AUDACIOUS_PLUGIN #include <audacious/plugin.h> #include <audacious/output.h> -#include <audacious/util.h> +#include <audacious/util.h> +#include <audacious/tuple.h> +#define HAVE_MEMSET #else #include <xmms/plugin.h> #include <xmms/util.h> +#include <xmms/titlestring.h> #endif #ifdef HAVE_ASSERT_H @@ -40,6 +43,13 @@ #endif +/* Metadata structures */ +#ifdef AUDACIOUS_PLUGIN +#define t_xs_tuple Tuple +#else +#define t_xs_tuple TitleInput +#endif + /* VFS replacement functions */ #ifdef __AUDACIOUS_NEWVFS__