Attachment 170053 Details for Bug 206480 – mic fix, v0

[patch] mic fix, v0

alsa_enumerate_v0.diff (text/plain), 3.02 KB, created by Jan Beich on 2016-05-06 18:33:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2016-05-06 18:33:17 UTC

Size: 3.02 KB

patch

obsolete

>Index: www/chromium/Makefile
>===================================================================
>--- www/chromium/Makefile	(revision 414704)
>+++ www/chromium/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	chromium
> PORTVERSION=	49.0.2623.112
>+PORTREVISION=	1
> CATEGORIES=	www
> MASTER_SITES=	http://commondatastorage.googleapis.com/chromium-browser-official/
> DISTFILES=	${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on
>@@ -52,6 +53,7 @@ LIB_DEPENDS=	libcairo.so:graphics/cairo \
> 		libwebp.so:graphics/webp
> 
> RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \
>+		alsa-lib>=1.1.1_1:audio/alsa-lib \
> 		droid-fonts-ttf>0:x11-fonts/droid-fonts-ttf \
> 		xdg-open:devel/xdg-utils
> 
>Index: www/chromium/files/patch-media__audio__alsa__audio_manager_alsa.cc
>===================================================================
>--- www/chromium/files/patch-media__audio__alsa__audio_manager_alsa.cc	(nonexistent)
>+++ www/chromium/files/patch-media__audio__alsa__audio_manager_alsa.cc	(working copy)
>@@ -0,0 +1,54 @@
>+--- media/audio/alsa/audio_manager_alsa.cc.orig	2016-04-07 19:01:10 UTC
>++++ media/audio/alsa/audio_manager_alsa.cc
>+@@ -128,7 +128,9 @@ void AudioManagerAlsa::GetAlsaAudioDevic
>+   int card = -1;
>+ 
>+   // Loop through the sound cards to get ALSA device hints.
>++#ifdef OS_LINUX
>+   while (!wrapper_->CardNext(&card) && card >= 0) {
>++#endif
>+     void** hints = NULL;
>+     int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints);
>+     if (!error) {
>+@@ -140,7 +142,9 @@ void AudioManagerAlsa::GetAlsaAudioDevic
>+       DLOG(WARNING) << "GetAlsaAudioDevices: unable to get device hints: "
>+                     << wrapper_->StrError(error);
>+     }
>++#ifdef OS_LINUX
>+   }
>++#endif
>+ }
>+ 
>+ void AudioManagerAlsa::GetAlsaDevicesInfo(
>+@@ -226,7 +230,11 @@ bool AudioManagerAlsa::IsAlsaDeviceAvail
>+     // goes through software conversion if needed (e.g. incompatible
>+     // sample rate).
>+     // TODO(joi): Should we prefer "hw" instead?
>++#ifdef OS_LINUX
>+     static const char kDeviceTypeDesired[] = "plughw";
>++#else
>++    static const char kDeviceTypeDesired[] = "plug";
>++#endif
>+     return strncmp(kDeviceTypeDesired,
>+                    device_name,
>+                    arraysize(kDeviceTypeDesired) - 1) == 0;
>+@@ -250,7 +258,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDe
>+   // Loop through the sound cards.
>+   // Don't use snd_device_name_hint(-1,..) since there is a access violation
>+   // inside this ALSA API with libasound.so.2.0.0.
>++#ifdef OS_LINUX
>+   while (!wrapper_->CardNext(&card) && (card >= 0) && !has_device) {
>++#endif
>+     int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints);
>+     if (!error) {
>+       for (void** hint_iter = hints; *hint_iter != NULL; hint_iter++) {
>+@@ -274,7 +284,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDe
>+       DLOG(WARNING) << "HasAnyAudioDevice: unable to get device hints: "
>+                     << wrapper_->StrError(error);
>+     }
>++#ifdef OS_LINUX
>+   }
>++#endif
>+ 
>+   return has_device;
>+ }

Flags:

jbeich: maintainer-approval? (chromium)

Actions: View | Diff

Attachments on bug 206480: 165931 | 170053 | 170055