[pulseaudio-commits] r1732 - /branches/lennart/src/daemon/main.c

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Fri Aug 31 00:44:19 2007
New Revision: 1732

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=3D1732&root=3Dpulseaudio&vi=
ew=3Drev
Log:
reorder initialization of pa_core variables

Modified:
    branches/lennart/src/daemon/main.c

Modified: branches/lennart/src/daemon/main.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/daemon/mai=
n.c?rev=3D1732&root=3Dpulseaudio&r1=3D1731&r2=3D1732&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/lennart/src/daemon/main.c (original)
+++ branches/lennart/src/daemon/main.c Fri Aug 31 00:44:19 2007
@@ -604,6 +604,11 @@
     c->default_sample_spec =3D conf->default_sample_spec;
     c->default_n_fragments =3D conf->default_n_fragments;
     c->default_fragment_size_msec =3D conf->default_fragment_size_msec;
+    c->disallow_module_loading =3D conf->disallow_module_loading;
+    c->exit_idle_time =3D conf->exit_idle_time;
+    c->module_idle_time =3D conf->module_idle_time;
+    c->scache_idle_time =3D conf->scache_idle_time;
+    c->resample_method =3D conf->resample_method;
 =

     pa_assert_se(pa_signal_init(pa_mainloop_get_api(mainloop)) =3D=3D 0);
     pa_signal_new(SIGINT, signal_callback, c);
@@ -634,7 +639,7 @@
         r =3D pa_cpu_limit_init(pa_mainloop_get_api(mainloop));
         assert(r =3D=3D 0);
     }
-
+    =

     buf =3D pa_strbuf_new();
     if (conf->default_script_file)
         r =3D pa_cli_command_execute_file(c, conf->default_script_file, bu=
f, &conf->fail);
@@ -663,12 +668,6 @@
         if (conf->daemonize)
             pa_loop_write(daemon_pipe[1], &retval, sizeof(retval), NULL);
 #endif
-
-        c->disallow_module_loading =3D conf->disallow_module_loading;
-        c->exit_idle_time =3D conf->exit_idle_time;
-        c->module_idle_time =3D conf->module_idle_time;
-        c->scache_idle_time =3D conf->scache_idle_time;
-        c->resample_method =3D conf->resample_method;
 =

         if (c->default_sink_name &&
             pa_namereg_get(c, c->default_sink_name, PA_NAMEREG_SINK, 1) =
=3D=3D NULL) {