Mercurial > audlegacy
changeset 4756:f084f639e962
Automated merge with ssh://paula@hg.atheme.org//hg/audacious
| author | Paula Stanciu <paula.stanciu@gmail.com> |
|---|---|
| date | Thu, 07 Aug 2008 12:17:14 +0300 |
| parents | b136f202ebfa (current diff) c6f352d25d27 (diff) |
| children | 8de129d08238 |
| files | src/audacious/output.c src/audacious/plugin.h src/audacious/pluginenum.c |
| diffstat | 4 files changed, 21 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/audacious/output.c Thu Aug 07 03:54:15 2008 +0300 +++ b/src/audacious/output.c Thu Aug 07 12:17:14 2008 +0300 @@ -682,3 +682,16 @@ SAD_dither_apply_replaygain(sad_state_from_float, &info, &mode); } + +void output_plugin_cleanup(void) +{ + OutputPlugin *op = get_current_output_plugin(); + op->init(); + output_close_audio(); + printf("output plugin cleanupn\n"); +} +void output_plugin_reinit(void) +{ + + printf("output plugin reinit \n"); +}
--- a/src/audacious/output.h Thu Aug 07 03:54:15 2008 +0300 +++ b/src/audacious/output.h Thu Aug 07 12:17:14 2008 +0300 @@ -70,5 +70,6 @@ extern OutputPlugin psuedo_output_plugin; extern OutputPluginData op_data; - +void output_plugin_cleanup(void); +void output_plugin_reinit(void); #endif /* AUDACIOUS_OUTPUT_H */
--- a/src/audacious/plugin.h Thu Aug 07 03:54:15 2008 +0300 +++ b/src/audacious/plugin.h Thu Aug 07 12:17:14 2008 +0300 @@ -656,6 +656,8 @@ gboolean (*vfs_fget_be16)(guint16 *value, VFSFile *stream); gboolean (*vfs_fget_be32)(guint32 *value, VFSFile *stream); gboolean (*vfs_fget_be64)(guint64 *value, VFSFile *stream); + void (*output_plugin_cleanup)(void); + void (*output_plugin_reinit)(void); }; /* Convenience macros for accessing the public API. */ @@ -1016,6 +1018,8 @@ #define aud_save_preset_file _audvt->save_preset_file #define aud_equalizer_read_aud_preset _audvt->equalizer_read_aud_preset #define aud_load_preset_file _audvt->load_preset_file +#define aud_output_plugin_cleanup _audvt->output_plugin_cleanup +#define aud_output_plugin_reinit _audvt->output_plugin_reinit #include "audacious/auddrct.h"
--- a/src/audacious/pluginenum.c Thu Aug 07 03:54:15 2008 +0300 +++ b/src/audacious/pluginenum.c Thu Aug 07 12:17:14 2008 +0300 @@ -399,6 +399,8 @@ .save_preset_file = save_preset_file, .equalizer_read_aud_preset = equalizer_read_aud_preset, .load_preset_file = load_preset_file, + .output_plugin_cleanup = output_plugin_cleanup, + .output_plugin_reinit = output_plugin_reinit, }; /*****************************************************************/