mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

* add proper error handling to pabrowse.c

Browse source 
* properly destroy pa_browser object on exit


git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1071 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2006-07-13 17:35:10 +00:00
parent d989c692ac
commit 1fd18d6b5f
1 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/utils/pabrowse.c
View file

@ -107,10 +107,18 @@ static void browser_callback(pa_browser *b, pa_browse_opcode_t c, const pa_brows
} }
} }
static void error_callback(pa_browser *b, const char *s, void *userdata) {
pa_mainloop_api*m = userdata;
fprintf(stderr, "Failure: %s\n", s);
m->quit(m, 1);
}
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
pa_mainloop *mainloop = NULL; pa_mainloop *mainloop = NULL;
pa_browser *browser = NULL; pa_browser *browser = NULL;
int ret = 1, r; int ret = 1, r;
const char *s;
if (!(mainloop = pa_mainloop_new())) if (!(mainloop = pa_mainloop_new()))
goto finish; goto finish;
@ -121,15 +129,22 @@ int main(int argc, char *argv[]) {
pa_signal_new(SIGTERM, exit_signal_callback, NULL); pa_signal_new(SIGTERM, exit_signal_callback, NULL);
signal(SIGPIPE, SIG_IGN); signal(SIGPIPE, SIG_IGN);
if (!(browser = pa_browser_new(pa_mainloop_get_api(mainloop)))) if (!(browser = pa_browser_new_full(pa_mainloop_get_api(mainloop), PA_BROWSE_FOR_SERVERS|PA_BROWSE_FOR_SINKS|PA_BROWSE_FOR_SOURCES, &s))) {
fprintf(stderr, "pa_browse_new_full(): %s\n", s);
goto finish; goto finish;
}
pa_browser_set_callback(browser, browser_callback, NULL); pa_browser_set_callback(browser, browser_callback, NULL);
pa_browser_set_error_callback(browser, error_callback, pa_mainloop_get_api(mainloop));
ret = 0; ret = 0;
pa_mainloop_run(mainloop, &ret); pa_mainloop_run(mainloop, &ret);
finish: finish:
if (browser)
pa_browser_unref(browser);
if (mainloop) { if (mainloop) {
pa_signal_done(); pa_signal_done();
pa_mainloop_free(mainloop); pa_mainloop_free(mainloop);