mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-12-21 08:56:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Tried to get the volume information even upon init failure.

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@626 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Pierre Ossman 2006-03-05 15:42:37 +00:00
parent dcd202f8eb
commit 7b6a9c3829
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/modules/module-alsa-sink.c
View file

@ -409,16 +409,16 @@ int pa__init(pa_core *c, pa_module*m) {
u->memchunk.index = u->memchunk.length = 0; u->memchunk.index = u->memchunk.length = 0;
ret = 0; ret = 0;
finish:
if (ma)
pa_modargs_free(ma);
/* Get initial mixer settings */ /* Get initial mixer settings */
if (u->sink->get_hw_volume) if (u->sink->get_hw_volume)
u->sink->get_hw_volume(u->sink); u->sink->get_hw_volume(u->sink);
if (u->sink->get_hw_mute) if (u->sink->get_hw_mute)
u->sink->get_hw_mute(u->sink); u->sink->get_hw_mute(u->sink);
finish:
if (ma)
pa_modargs_free(ma);
return ret; return ret;

8
src/modules/module-alsa-source.c
View file

@ -398,15 +398,15 @@ int pa__init(pa_core *c, pa_module*m) {
ret = 0; ret = 0;
finish:
if (ma)
pa_modargs_free(ma);
/* Get initial mixer settings */ /* Get initial mixer settings */
if (u->source->get_hw_volume) if (u->source->get_hw_volume)
u->source->get_hw_volume(u->source); u->source->get_hw_volume(u->source);
if (u->source->get_hw_mute) if (u->source->get_hw_mute)
u->source->get_hw_mute(u->source); u->source->get_hw_mute(u->source);
finish:
if (ma)
pa_modargs_free(ma);
return ret; return ret;