code.ossystems Code Review - meta-freescale.git/blob

   1 From 015e048d3662b9f82e9aa5cd04d7c9de4eadb68d Mon Sep 17 00:00:00 2001
   2 From: Shengjiu Wang <shengjiu.wang@freescale.com>
   3 Date: Mon, 30 Mar 2015 10:26:14 +0800
   4 Subject: [PATCH] pulseaudio: remove the control for speaker/headphone widget
   5
   6 In imx7d-sdb, there is no headphone jack, the jack detection is done
   7 by the codec itself. When headphone plugin, pulseaudio can't detect
   8 the headphone jack status, so it will set the heaphone volume to zero.
   9 Here fix this issue by remove the control in configuration.
  10
  11 Upstream-Status: Inappropriate [i.MX specific]
  12
  13 Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
  14 ---
  15  .../alsa/mixer/paths/analog-output-headphones.conf |    8 ++++----
  16  .../alsa/mixer/paths/analog-output-speaker.conf    |    8 ++++----
  17  2 files changed, 8 insertions(+), 8 deletions(-)
  18
  19 diff --git a/src/modules/alsa/mixer/paths/analog-output-headphones.conf b/src/modules/alsa/mixer/paths/analog-output-headphones.conf
  20 index b6ee70b..a617976 100644
  21 --- a/src/modules/alsa/mixer/paths/analog-output-headphones.conf
  22 +++ b/src/modules/alsa/mixer/paths/analog-output-headphones.conf
  23 @@ -81,8 +81,8 @@ override-map.2 = all-left,all-right
  24
  25  [Element Headphone]
  26  required-any = any
  27 -switch = mute
  28 -volume = merge
  29 +switch = on
  30 +volume = ignore
  31  override-map.1 = all
  32  override-map.2 = all-left,all-right
  33
  34 @@ -105,8 +105,8 @@ switch = mute
  35  volume = zero
  36
  37  [Element Speaker]
  38 -switch = off
  39 -volume = off
  40 +switch = on
  41 +volume = ignore
  42
  43  [Element Desktop Speaker]
  44  switch = off
  45 diff --git a/src/modules/alsa/mixer/paths/analog-output-speaker.conf b/src/modules/alsa/mixer/paths/analog-output-speaker.conf
  46 index 39193dd..34bbb85 100644
  47 --- a/src/modules/alsa/mixer/paths/analog-output-speaker.conf
  48 +++ b/src/modules/alsa/mixer/paths/analog-output-speaker.conf
  49 @@ -73,8 +73,8 @@ volume = off
  50  ; This profile path is intended to control the speaker, let's mute headphones
  51  ; else there will be a spike when plugging in headphones
  52  [Element Headphone]
  53 -switch = off
  54 -volume = off
  55 +switch = on
  56 +volume = ignore
  57
  58  [Element Headphone2]
  59  switch = off
  60 @@ -93,8 +93,8 @@ override-map.2 = all-left,all-right
  61
  62  [Element Speaker]
  63  required-any = any
  64 -switch = mute
  65 -volume = merge
  66 +switch = on
  67 +volume = ignore
  68  override-map.1 = all
  69  override-map.2 = all-left,all-right
  70
  71 --
  72 1.7.9.5
  73