recipes-multimedia/pulseaudio/pulseaudio_5.0/0083-configuration-Add-default-IVI-audio-group-and-main-v.patch

   1 From: Tanu Kaskinen <tanu.kaskinen@linux.intel.com>
   2 Date: Thu, 22 May 2014 14:43:33 +0300
   3 Subject: configuration: Add default IVI audio group and main volume
   4  configuration
   5
   6 Change-Id: Idd348cc9f469e988405d574dbc2459c5822a33c2
   7 Signed-off-by: Jaska Uimonen <jaska.uimonen@intel.com>
   8 ---
   9  src/Makefile.am                                | 21 ++++++++++++++++
  10  src/tizen-ivi-examples/audio-groups.conf       | 33 ++++++++++++++++++++++++++
  11  src/tizen-ivi-examples/main-volume-policy.conf | 20 ++++++++++++++++
  12  3 files changed, 74 insertions(+)
  13  create mode 100644 src/tizen-ivi-examples/audio-groups.conf
  14  create mode 100644 src/tizen-ivi-examples/main-volume-policy.conf
  15
  16 diff --git a/src/Makefile.am b/src/Makefile.am
  17 index 8fa60ec..d57c30b 100644
  18 --- a/src/Makefile.am
  19 +++ b/src/Makefile.am
  20 @@ -89,6 +89,8 @@ MODULE_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_
  21  EXTRA_DIST = \
  22                 pulse/client.conf.in \
  23                 pulse/version.h.in \
  24 +               tizen-ivi-examples/audio-groups.conf \
  25 +               tizen-ivi-examples/main-volume-policy.conf \
  26                 daemon/daemon.conf.in \
  27                 daemon/default.pa.in \
  28                 daemon/system.pa.in \
  29 @@ -111,6 +113,25 @@ pulseconf_DATA = \
  30                 daemon.conf \
  31                 client.conf
  32
  33 +# Add some Tizen specific configuration files.
  34 +#
  35 +# FIXME: These configuration files should be installed only if explicitly
  36 +# requested, because they define policy which may not be the desired policy in
  37 +# every Tizen profile. Currently default.pa loads module-audio-groups and
  38 +# module-main-volume-policy only if module-murphy-ivi is installed in the
  39 +# system, which helps with this issue, because non-IVI profiles don't
  40 +# currently use module-murphy-ivi, so these configuration files won't have any
  41 +# effect outside the IVI profile, but this is pretty hacky solution. It would
  42 +# be better to load module-audio-groups and module-main-volume-policy
  43 +# unconditionally, since they're not really tied to the Murphy module in any
  44 +# way. We use this hack, because otherwise we'd need a configure switch for
  45 +# enabling the example IVI configuration, and a new configure switch would also
  46 +# require a new switch in the Tizen IVI image configuration. That's an extra
  47 +# hurdle that we decided to avoid for now.
  48 +pulseconf_DATA += \
  49 +               tizen-ivi-examples/audio-groups.conf \
  50 +               tizen-ivi-examples/main-volume-policy.conf
  51 +
  52  if HAVE_DBUS
  53  dbuspolicy_DATA = \
  54                 daemon/pulseaudio-system.conf
  55 diff --git a/src/tizen-ivi-examples/audio-groups.conf b/src/tizen-ivi-examples/audio-groups.conf
  56 new file mode 100644
  57 index 0000000..54939c9
  58 --- /dev/null
  59 +++ b/src/tizen-ivi-examples/audio-groups.conf
  60 @@ -0,0 +1,33 @@
  61 +[General]
  62 +audio-groups = x-example-call-downlink-audio-group x-example-navigator-output-audio-group x-example-default-output-audio-group
  63 +streams = call-downlink navigator-output default-output
  64 +
  65 +[AudioGroup x-example-call-downlink-audio-group]
  66 +description = Call downlink
  67 +volume-control = create
  68 +mute-control = create
  69 +
  70 +[AudioGroup x-example-navigator-output-audio-group]
  71 +description = Navigator
  72 +volume-control = create
  73 +mute-control = create
  74 +
  75 +[AudioGroup x-example-default-output-audio-group]
  76 +description = Default
  77 +volume-control = create
  78 +mute-control = create
  79 +
  80 +[Stream call-downlink]
  81 +match = (direction output AND property media.role=phone)
  82 +audio-group-for-volume = x-example-call-downlink-audio-group
  83 +audio-group-for-mute = x-example-call-downlink-audio-group
  84 +
  85 +[Stream navigator-output]
  86 +match = (direction output AND property media.role=navigator)
  87 +audio-group-for-volume = x-example-navigator-output-audio-group
  88 +audio-group-for-mute = x-example-navigator-output-audio-group
  89 +
  90 +[Stream default-output]
  91 +match = (direction output)
  92 +audio-group-for-volume = x-example-default-output-audio-group
  93 +audio-group-for-mute = x-example-default-output-audio-group
  94 diff --git a/src/tizen-ivi-examples/main-volume-policy.conf b/src/tizen-ivi-examples/main-volume-policy.conf
  95 new file mode 100644
  96 index 0000000..5a73308
  97 --- /dev/null
  98 +++ b/src/tizen-ivi-examples/main-volume-policy.conf
  99 @@ -0,0 +1,20 @@
 100 +[General]
 101 +output-volume-model = by-active-main-volume-context
 102 +input-volume-model = none
 103 +output-mute-model = by-active-main-volume-context
 104 +input-mute-model = none
 105 +main-volume-contexts = x-example-call-main-volume-context x-example-default-main-volume-context
 106 +
 107 +[MainVolumeContext x-example-call-main-volume-context]
 108 +description = Call main volume context
 109 +main-output-volume-control = bind:AudioGroup:x-example-call-downlink-audio-group
 110 +main-input-volume-control = none
 111 +main-output-mute-control = bind:AudioGroup:x-example-call-downlink-audio-group
 112 +main-input-mute-control = none
 113 +
 114 +[MainVolumeContext x-example-default-main-volume-context]
 115 +description = Default main volume context
 116 +main-output-volume-control = bind:AudioGroup:x-example-default-output-audio-group
 117 +main-input-volume-control = none
 118 +main-output-mute-control = bind:AudioGroup:x-example-default-output-audio-group
 119 +main-input-mute-control = none