Mercurial > audlegacy-plugins
changeset 1075:37abd9b3de4b trunk
[svn] - conversion to yaz's style was not needed, just API v2 ;p
| author | nenolod |
|---|---|
| date | Thu, 24 May 2007 15:53:40 -0700 |
| parents | 0847931f52b7 |
| children | 91f6c4647bae |
| files | ChangeLog src/aac/src/libmp4.c src/alac/plugin.c src/wma/wma.c |
| diffstat | 4 files changed, 12 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu May 24 15:46:25 2007 -0700 +++ b/ChangeLog Thu May 24 15:53:40 2007 -0700 @@ -1,3 +1,10 @@ +2007-05-24 22:46:25 +0000 Tony Vroon <chainsaw@gentoo.org> + revision [2314] + Port to plugin API v2. + trunk/src/alac/plugin.c | 66 +++++++++++++++--------------------------------- + 1 file changed, 21 insertions(+), 45 deletions(-) + + 2007-05-24 22:21:11 +0000 Tony Vroon <chainsaw@gentoo.org> revision [2312] Port to plugin API v2.
--- a/src/aac/src/libmp4.c Thu May 24 15:46:25 2007 -0700 +++ b/src/aac/src/libmp4.c Thu May 24 15:53:40 2007 -0700 @@ -72,8 +72,6 @@ DECLARE_PLUGIN(mp4, NULL, NULL, mp4_iplist, NULL, NULL, NULL, NULL); -InputPlugin *mp4_plugin = &mp4_ip; - typedef struct _mp4cfg { #define FILE_UNKNOWN 0 @@ -560,7 +558,7 @@ playback->output->open_audio(FMT_S16_NE, samplerate, channels); playback->output->flush(0); - mp4_plugin->set_info(xmmstitle, msDuration, + mp4_ip.set_info(xmmstitle, msDuration, mp4ff_get_avg_bitrate( mp4file, mp4track ), samplerate,channels); @@ -738,7 +736,7 @@ g_thread_exit(NULL); } - mp4_plugin->set_info(xmmstitle, -1, -1, samplerate, channels); + mp4_ip.set_info(xmmstitle, -1, -1, samplerate, channels); playback->output->flush(0); while(buffer_playing && buffervalid > 0 && streambuffer != NULL) @@ -776,7 +774,7 @@ ostmp = stemp; - mp4_plugin->set_info(xmmstitle, -1, -1, samplerate, channels); + mp4_ip.set_info(xmmstitle, -1, -1, samplerate, channels); } }
--- a/src/alac/plugin.c Thu May 24 15:46:25 2007 -0700 +++ b/src/alac/plugin.c Thu May 24 15:53:40 2007 -0700 @@ -315,8 +315,6 @@ DECLARE_PLUGIN(alac, NULL, NULL, alac_iplist, NULL, NULL, NULL, NULL); -InputPlugin *alac_plugin = &alac_ip; - gpointer decode_thread(void *args) { demux_res_t demux_res; @@ -358,7 +356,7 @@ (float)(demux_res.sample_rate / 251)); playback->output->open_audio(FMT_S16_LE, demux_res.sample_rate, demux_res.num_channels); - alac_plugin->set_info(title, duration, -1, demux_res.sample_rate, demux_res.num_channels); + alac_ip.set_info(title, duration, -1, demux_res.sample_rate, demux_res.num_channels); /* will convert the entire buffer */ GetBuffer(&demux_res);
--- a/src/wma/wma.c Thu May 24 15:46:25 2007 -0700 +++ b/src/wma/wma.c Thu May 24 15:53:40 2007 -0700 @@ -110,8 +110,6 @@ DECLARE_PLUGIN(wma, NULL, NULL, wma_iplist, NULL, NULL, NULL, NULL); -InputPlugin *wma_plugin = &wma_ip; - static gchar *str_twenty_to_space(gchar * str) { gchar *match, *match_end; @@ -443,7 +441,7 @@ wma_st_buff = ST_BUFF; - wma_plugin->set_info(wsong_title, wsong_time, c->bit_rate, c->sample_rate, c->channels); + wma_ip.set_info(wsong_title, wsong_time, c->bit_rate, c->sample_rate, c->channels); /* av_malloc() will wrap posix_memalign() if necessary -nenolod */ wma_s_outbuf = av_malloc(wma_st_buff);