Mercurial > audlegacy
changeset 3709:a89a12aa4f2c
Add InputPlayback::pass_audio() which replaces produce_audio().
author | William Pitcock <nenolod@atheme.org> |
---|---|
date | Mon, 08 Oct 2007 01:43:58 -0500 |
parents | 6f4068a0f291 |
children | 602002306969 |
files | src/audacious/output.c src/audacious/output.h src/audacious/playback.c src/audacious/plugin.h |
diffstat | 4 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/audacious/output.c Mon Oct 08 01:36:41 2007 -0500 +++ b/src/audacious/output.c Mon Oct 08 01:43:58 2007 -0500 @@ -412,7 +412,7 @@ /* called by input plugin when data is ready */ void -produce_audio(gint unused, /* will become InputPlayback soon */ +output_pass_audio(InputPlayback *playback, AFormat fmt, /* output format */ gint nch, /* channels */ gint length, /* length of sample */ @@ -421,7 +421,6 @@ ) { static Flow *postproc_flow = NULL; - InputPlayback *playback = get_current_input_playback(); OutputPlugin *op = playback->output; gint writeoffs; gint time = playback->output->written_time();
--- a/src/audacious/output.h Mon Oct 08 01:36:41 2007 -0500 +++ b/src/audacious/output.h Mon Oct 08 01:43:58 2007 -0500 @@ -62,7 +62,7 @@ gint output_buffer_free(void); gint output_buffer_playing(void); -void produce_audio(gint, AFormat, gint, gint, gpointer, int *); +void output_pass_audio(InputPlayback *, AFormat, gint, gint, gpointer, int *); gint get_written_time(void); gint get_output_time(void);
--- a/src/audacious/playback.c Mon Oct 08 01:36:41 2007 -0500 +++ b/src/audacious/playback.c Mon Oct 08 01:43:58 2007 -0500 @@ -412,6 +412,7 @@ playback->set_pb_change = playback_set_pb_change; playback->set_params = playback_set_pb_params; playback->set_title = playback_set_pb_title; + playback->pass_audio = output_pass_audio; set_current_input_playback(playback);
--- a/src/audacious/plugin.h Mon Oct 08 01:36:41 2007 -0500 +++ b/src/audacious/plugin.h Mon Oct 08 01:43:58 2007 -0500 @@ -472,6 +472,8 @@ void (*set_params) (InputPlayback *, gchar * title, gint length, gint rate, gint freq, gint nch); void (*set_title) (InputPlayback *, gchar * text); + + void (*pass_audio) (InputPlayback *, AFormat, gint, gint, gpointer, gint *); }; struct _InputPlugin {