Mercurial > hg > xmms-sid

comparison src/xs_support.h @ 611:a751d2b85a7d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
610:88bc61a2914f 611:a751d2b85a7d
13 #include <stdio.h> 13 #include <stdio.h>
14 14
15 #ifdef AUDACIOUS_PLUGIN 15 #ifdef AUDACIOUS_PLUGIN
16 #include <audacious/plugin.h> 16 #include <audacious/plugin.h>
17 #include <audacious/output.h> 17 #include <audacious/output.h>
18 #include <audacious/util.h> 18 #include <audacious/util.h>
19 #include <audacious/tuple.h>
20 #define HAVE_MEMSET
19 #else 21 #else
20 #include <xmms/plugin.h> 22 #include <xmms/plugin.h>
21 #include <xmms/util.h> 23 #include <xmms/util.h>
24 #include <xmms/titlestring.h>
22 #endif 25 #endif
23 26
24 #ifdef HAVE_ASSERT_H 27 #ifdef HAVE_ASSERT_H
25 #include <assert.h> 28 #include <assert.h>
26 #else 29 #else
37 40
38 #ifdef HAVE_MEMORY_H 41 #ifdef HAVE_MEMORY_H
39 #include <memory.h> 42 #include <memory.h>
40 #endif 43 #endif
41 44
45
46 /* Metadata structures */
47 #ifdef AUDACIOUS_PLUGIN
48 #define t_xs_tuple Tuple
49 #else
50 #define t_xs_tuple TitleInput
51 #endif
42 52
43 /* VFS replacement functions 53 /* VFS replacement functions
44 */ 54 */
45 #ifdef __AUDACIOUS_NEWVFS__ 55 #ifdef __AUDACIOUS_NEWVFS__
46 #include <audacious/vfs.h> 56 #include <audacious/vfs.h>