[polypaudio-commits] r626 - in /trunk/src/modules: module-alsa-sink.c module-alsa-source.c

[svnmailer-noreply at 0pointer.de]

Author: ossman
Date: Sun Mar  5 16:42:37 2006
New Revision: 626

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=626&root=polypaudio&view=rev
Log:
Tried to get the volume information even upon init failure.

Modified:
    trunk/src/modules/module-alsa-sink.c
    trunk/src/modules/module-alsa-source.c

Modified: trunk/src/modules/module-alsa-sink.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-alsa-sink.c?rev=626&root=polypaudio&r1=625&r2=626&view=diff
==============================================================================
--- trunk/src/modules/module-alsa-sink.c (original)
+++ trunk/src/modules/module-alsa-sink.c Sun Mar  5 16:42:37 2006
@@ -409,16 +409,16 @@
     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;
 

Modified: trunk/src/modules/module-alsa-source.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-alsa-source.c?rev=626&root=polypaudio&r1=625&r2=626&view=diff
==============================================================================
--- trunk/src/modules/module-alsa-source.c (original)
+++ trunk/src/modules/module-alsa-source.c Sun Mar  5 16:42:37 2006
@@ -398,15 +398,15 @@
     
     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;