Tried to get the volume information even upon init failure.

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@626 fefdeb5f-60dc-0310-8127-8f9354f1896f

diff --git a/src/modules/module-alsa-sink.c b/src/modules/module-alsa-sink.c
index 732612ef1c6f38c090c129b9c0b4f73988ebe7cd..0053acd2bf24f28faa173a7de53a674f4af821a3 100644 (file)
--- a/src/modules/module-alsa-sink.c
+++ b/src/modules/module-alsa-sink.c
@@ -409,16 +409,16 @@ int pa__init(pa_core *c, pa_module*m) {
     u->memchunk.index = u->memchunk.length = 0;
     
     ret = 0;
-     
-finish:
-     if (ma)
-         pa_modargs_free(ma);
 
     /* Get initial mixer settings */
     if (u->sink->get_hw_volume)
         u->sink->get_hw_volume(u->sink);
     if (u->sink->get_hw_mute)
         u->sink->get_hw_mute(u->sink);
+     
+finish:
+     if (ma)
+         pa_modargs_free(ma);
     
     return ret;
 

diff --git a/src/modules/module-alsa-source.c b/src/modules/module-alsa-source.c
index 1b7ae7d35d78267c81b54a141ac372d0cf7d5c95..5a6dc144169cbb270f4f75ff05fa1ac963796dad 100644 (file)
--- a/src/modules/module-alsa-source.c
+++ b/src/modules/module-alsa-source.c
@@ -398,15 +398,15 @@ int pa__init(pa_core *c, pa_module*m) {
     
     ret = 0;
 
-finish:
-     if (ma)
-         pa_modargs_free(ma);
-
     /* Get initial mixer settings */
     if (u->source->get_hw_volume)
         u->source->get_hw_volume(u->source);
     if (u->source->get_hw_mute)
         u->source->get_hw_mute(u->source);
+
+finish:
+     if (ma)
+         pa_modargs_free(ma);
     
     return ret;