mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

add new "disable-shm" server config option

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1286 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2006-08-19 01:20:13 +00:00
parent c9b6d55090
commit dbc658df41
3 changed files with 24 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/daemon/main.c
View file

@ -306,10 +306,10 @@ static void set_all_rlimits(const pa_daemon_conf *conf) {
#endif
int main(int argc, char *argv[]) {
pa_core *c;
pa_core *c = NULL;
pa_strbuf *buf = NULL;
pa_daemon_conf *conf;
pa_mainloop *mainloop;
pa_daemon_conf *conf = NULL;
pa_mainloop *mainloop = NULL;
char *s;
int r, retval = 1, d = 0;
@ -559,8 +559,9 @@ int main(int argc, char *argv[]) {
mainloop = pa_mainloop_new();
assert(mainloop);
c = pa_core_new(pa_mainloop_get_api(mainloop), 1);
assert(c);
if (!(c = pa_core_new(pa_mainloop_get_api(mainloop), !conf->disable_shm)))
goto finish;
c->is_system_instance = !!conf->system_instance;
r = pa_signal_init(pa_mainloop_get_api(mainloop));
@ -651,12 +652,14 @@ int main(int argc, char *argv[]) {
pa_cpu_limit_done();
pa_signal_done();
pa_mainloop_free(mainloop);
pa_log_info("Daemon terminated.");
finish:
if (mainloop)
pa_mainloop_free(mainloop);
if (conf)
pa_daemon_conf_free(conf);