Mercurial > audlegacy
changeset 3232:2453bf125b4f trunk
Automated merge with ssh://hg.atheme.org//hg/audacious
| author | William Pitcock <nenolod@atheme-project.org> |
|---|---|
| date | Fri, 03 Aug 2007 20:39:42 -0500 |
| parents | 06baa146fc1d (diff) cfb76302b468 (current diff) |
| children | 88f602569477 |
| files | src/audacious/plugin.h src/audacious/pluginenum.c src/audacious/widgets/playlist_list.c src/audacious/widgets/playlist_list.h src/audacious/widgets/playlist_slider.c src/audacious/widgets/playlist_slider.h src/audacious/widgets/widget.c src/audacious/widgets/widget.h |
| diffstat | 2 files changed, 1 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/audacious/plugin.h Fri Aug 03 22:51:04 2007 +0200 +++ b/src/audacious/plugin.h Fri Aug 03 20:39:42 2007 -0500 @@ -51,7 +51,7 @@ #define LOWLEVEL_PLUGIN(x) ((LowlevelPlugin *)(x)) #define __AUDACIOUS_NEWVFS__ -#define __AUDACIOUS_PLUGIN_API__ 3 +#define __AUDACIOUS_PLUGIN_API__ 4 #define __AUDACIOUS_INPUT_PLUGIN_API__ 4 typedef enum {
--- a/src/audacious/pluginenum.c Fri Aug 03 22:51:04 2007 +0200 +++ b/src/audacious/pluginenum.c Fri Aug 03 20:39:42 2007 -0500 @@ -250,11 +250,9 @@ if (header->magic != PLUGIN_MAGIC) return plugin2_dispose(module, "plugin <%s> discarded, invalid module magic", filename); -#if 0 if (header->api_version != __AUDACIOUS_PLUGIN_API__) return plugin2_dispose(module, "plugin <%s> discarded, wanting API version %d, we implement API version %d", filename, header->api_version, __AUDACIOUS_PLUGIN_API__); -#endif if (header->init) header->init();