On Tue, 2013-04-02 at 11:43 +0200, Maarten Lankhorst wrote:
> This will allow init_eld_ctls to succeed even when no jacks are found.
>
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst at canonical.com>
> ---
> diff --git a/src/modules/alsa/module-alsa-card.c b/src/modules/alsa/module-alsa-card.c
> index 3b96cea..822f9c9 100644
> --- a/src/modules/alsa/module-alsa-card.c
> +++ b/src/modules/alsa/module-alsa-card.c
> @@ -487,9 +490,6 @@ static void init_jacks(struct userdata *u) {
>
> pa_log_debug("Found %d jacks.", pa_hashmap_size(u->jacks));
>
> - if (pa_hashmap_size(u->jacks) == 0)
> - return;
> -
> u->mixer_fdl = pa_alsa_fdlist_new();
>
> u->mixer_handle = pa_alsa_open_mixer(u->alsa_card_index, NULL, &u->hctl_handle);
I think init_jacks() should initialize the jacks, nothing more.
u->mixer_fdl, u->mixer_handle and u->hctl_handle should be initialized
somewhere else, like init_mixer() or something like that.
--
Tanu
