mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-31 22:25:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

echo-cancel: Better handling of error conditions in test

Browse source
This commit is contained in:
Peter Meerwald 2011-12-13 15:51:54 +01:00 • committed by Arun Raghavan
parent 6eb0f133c4
commit be9ef2e96c
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/modules/echo-cancel/module-echo-cancel.c
View file

@ -1694,7 +1694,7 @@ int pa__init(pa_module*m) {
goto fail;
}
if (init_common(ma, u, &source_ss, &source_map))
if (init_common(ma, u, &source_ss, &source_map) < 0)
goto fail;
u->asyncmsgq = pa_asyncmsgq_new(0);
@ -2077,7 +2077,8 @@ int main(int argc, char* argv[]) {
source_ss.channels = DEFAULT_CHANNELS;
pa_channel_map_init_auto(&source_map, source_ss.channels, PA_CHANNEL_MAP_DEFAULT);
init_common(ma, &u, &source_ss, &source_map);
if (init_common(ma, &u, &source_ss, &source_map) < 0)
goto fail;
if (!u.ec->init(u.core, u.ec, &source_ss, &source_map, &sink_ss, &sink_map, &u.blocksize,
(argc > 4) ? argv[5] : NULL )) {
@ -2169,13 +2170,16 @@ int main(int argc, char* argv[]) {
u.ec->done(u.ec);
fclose(u.captured_file);
fclose(u.played_file);
fclose(u.canceled_file);
out:
if (u.captured_file)
fclose(u.captured_file);
if (u.played_file)
fclose(u.played_file);
if (u.canceled_file)
fclose(u.canceled_file);
if (u.drift_file)
fclose(u.drift_file);
out:
pa_xfree(rdata);
pa_xfree(pdata);
pa_xfree(cdata);