Mercurial > audlegacy-plugins
changeset 1996:1af8c095a1c5
Automated merge with ssh://hg.atheme.org//hg/audacious-plugins
| author | William Pitcock <nenolod@atheme.org> |
|---|---|
| date | Sun, 07 Oct 2007 18:20:06 -0500 |
| parents | 47a7b26717d4 (current diff) c51e3d7ae9a8 (diff) |
| children | 9d0f5be50219 |
| files | |
| diffstat | 4 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/adplug/adplug-xmms.cc Sun Oct 07 18:20:00 2007 -0500 +++ b/src/adplug/adplug-xmms.cc Sun Oct 07 18:20:06 2007 -0500 @@ -93,9 +93,6 @@ static InputPlayback *playback; -// XXX: this function is not in the public API yet. -extern "C" VFSFile * aud_vfs_buffered_file_new_from_uri (gchar * uri); - /***** Debugging *****/ #ifdef DEBUG
--- a/src/adplug/core/binio_virtual.h Sun Oct 07 18:20:00 2007 -0500 +++ b/src/adplug/core/binio_virtual.h Sun Oct 07 18:20:06 2007 -0500 @@ -12,7 +12,10 @@ #include <string> #include <glib.h> -#include <audacious/vfs.h> + +extern "C" { +#include <audacious/plugin.h> +}; class vfsistream : public binistream, virtual public binio { private:
--- a/src/amidi-plug/amidi-plug.h Sun Oct 07 18:20:00 2007 -0500 +++ b/src/amidi-plug/amidi-plug.h Sun Oct 07 18:20:06 2007 -0500 @@ -63,7 +63,7 @@ 0 /* ap_opts_lyrics_extract */ }; -gchar *amidiplug_aud_vfs_extensions[] = { "mid" , "midi" , "rmi" , "rmid" , NULL }; +gchar *amidiplug_vfs_extensions[] = { "mid" , "midi" , "rmi" , "rmid" , NULL }; gpointer amidiplug_play_loop( gpointer ); gpointer amidiplug_audio_loop( gpointer ); @@ -102,7 +102,7 @@ .get_song_info = amidiplug_get_song_info, /* get_song_info */ .file_info_box = amidiplug_file_info_box, /* file_info_box */ .is_our_file_from_vfs = amidiplug_is_our_file_from_vfs, /* is_our_file_from_vfs */ - .aud_vfs_extensions = amidiplug_aud_vfs_extensions /* aud_vfs_extensions */ + .vfs_extensions = amidiplug_vfs_extensions /* aud_vfs_extensions */ }; #endif /* !_I_AMIDIPLUG_H */
--- a/src/amidi-plug/i_vfslayer.h Sun Oct 07 18:20:00 2007 -0500 +++ b/src/amidi-plug/i_vfslayer.h Sun Oct 07 18:20:06 2007 -0500 @@ -23,7 +23,7 @@ #define _I_VFSLAYER_H 1 #include "i_common.h" -#include <audacious/vfs.h> +#include <audacious/plugin.h> #define VFS_FOPEN( x , y ) aud_vfs_fopen( x , y )