From 179c384901c36f28aea76714f1d6abd9d64c9097 Mon Sep 17 00:00:00 2001 From: Seungbae Shin Date: Thu, 31 Aug 2017 17:56:14 +0900 Subject: [PATCH] [Audio] Update default alsa configuration (/etc/asound.conf) properly [Version] 0.2.115 [Profile] Common [Issue Type] Revise Change-Id: I8285a861627fadc711dd8f781b7c4e155b9261f5 --- mmfw-sysconf-simulator/etc/asound.conf | 12 ------- mmfw-sysconf-target-artik10/etc/asound.conf | 45 ++------------------------ mmfw-sysconf-target-n4/etc/asound.conf | 45 ++------------------------ mmfw-sysconf-target-rpi3/etc/asound.conf | 49 +++-------------------------- mmfw-sysconf-target-tw1/etc/asound.conf | 45 ++------------------------ mmfw-sysconf-target-tw2/etc/asound.conf | 45 ++------------------------ mmfw-sysconf-target-u3/etc/asound.conf | 45 ++------------------------ packaging/mmfw-sysconf.spec | 2 +- 8 files changed, 21 insertions(+), 267 deletions(-) diff --git a/mmfw-sysconf-simulator/etc/asound.conf b/mmfw-sysconf-simulator/etc/asound.conf index 5b99392..86fa895 100644 --- a/mmfw-sysconf-simulator/etc/asound.conf +++ b/mmfw-sysconf-simulator/etc/asound.conf @@ -9,15 +9,3 @@ ctl. !default { type hw card 0 } - -pcm. AIF2{ - type hw - card 0 - device 1 -} - -pcm. AIF3{ - type hw - card 0 - device 3 -} diff --git a/mmfw-sysconf-target-artik10/etc/asound.conf b/mmfw-sysconf-target-artik10/etc/asound.conf index f717a3e..acaf318 100644 --- a/mmfw-sysconf-target-artik10/etc/asound.conf +++ b/mmfw-sysconf-target-artik10/etc/asound.conf @@ -1,50 +1,11 @@ -pcm. !default { - type asym - playback.pcm { - type hw - card 0 - device 0 - } - capture.pcm { - type hw - card 0 - device 0 - } -} +# default sound configuration -ctl. !default { - type hw - card 0 -} - -pcm. AIF2{ - type hw - card 0 - device 1 - format S16_LE - channels 2 - rate 8000 -} - -pcm. AIF3{ - type hw - card 0 - device 2 - format S16_LE - channels 2 - rate 8000 -} - -pcm. AIF4{ +pcm. !default { type hw card 0 - device 4 - format S16_LE - channels 2 - rate 44100 } -ctl. wm1811 { +ctl. !default { type hw card 0 } diff --git a/mmfw-sysconf-target-n4/etc/asound.conf b/mmfw-sysconf-target-n4/etc/asound.conf index f717a3e..acaf318 100644 --- a/mmfw-sysconf-target-n4/etc/asound.conf +++ b/mmfw-sysconf-target-n4/etc/asound.conf @@ -1,50 +1,11 @@ -pcm. !default { - type asym - playback.pcm { - type hw - card 0 - device 0 - } - capture.pcm { - type hw - card 0 - device 0 - } -} +# default sound configuration -ctl. !default { - type hw - card 0 -} - -pcm. AIF2{ - type hw - card 0 - device 1 - format S16_LE - channels 2 - rate 8000 -} - -pcm. AIF3{ - type hw - card 0 - device 2 - format S16_LE - channels 2 - rate 8000 -} - -pcm. AIF4{ +pcm. !default { type hw card 0 - device 4 - format S16_LE - channels 2 - rate 44100 } -ctl. wm1811 { +ctl. !default { type hw card 0 } diff --git a/mmfw-sysconf-target-rpi3/etc/asound.conf b/mmfw-sysconf-target-rpi3/etc/asound.conf index f717a3e..a62fb60 100644 --- a/mmfw-sysconf-target-rpi3/etc/asound.conf +++ b/mmfw-sysconf-target-rpi3/etc/asound.conf @@ -1,50 +1,11 @@ -pcm. !default { - type asym - playback.pcm { - type hw - card 0 - device 0 - } - capture.pcm { - type hw - card 0 - device 0 - } -} - -ctl. !default { - type hw - card 0 -} - -pcm. AIF2{ - type hw - card 0 - device 1 - format S16_LE - channels 2 - rate 8000 -} +# default sound configuration -pcm. AIF3{ - type hw - card 0 - device 2 - format S16_LE - channels 2 - rate 8000 -} - -pcm. AIF4{ +pcm. !default { type hw - card 0 - device 4 - format S16_LE - channels 2 - rate 44100 + card 1 } -ctl. wm1811 { +ctl. !default { type hw - card 0 + card 1 } diff --git a/mmfw-sysconf-target-tw1/etc/asound.conf b/mmfw-sysconf-target-tw1/etc/asound.conf index f717a3e..acaf318 100644 --- a/mmfw-sysconf-target-tw1/etc/asound.conf +++ b/mmfw-sysconf-target-tw1/etc/asound.conf @@ -1,50 +1,11 @@ -pcm. !default { - type asym - playback.pcm { - type hw - card 0 - device 0 - } - capture.pcm { - type hw - card 0 - device 0 - } -} +# default sound configuration -ctl. !default { - type hw - card 0 -} - -pcm. AIF2{ - type hw - card 0 - device 1 - format S16_LE - channels 2 - rate 8000 -} - -pcm. AIF3{ - type hw - card 0 - device 2 - format S16_LE - channels 2 - rate 8000 -} - -pcm. AIF4{ +pcm. !default { type hw card 0 - device 4 - format S16_LE - channels 2 - rate 44100 } -ctl. wm1811 { +ctl. !default { type hw card 0 } diff --git a/mmfw-sysconf-target-tw2/etc/asound.conf b/mmfw-sysconf-target-tw2/etc/asound.conf index f717a3e..acaf318 100644 --- a/mmfw-sysconf-target-tw2/etc/asound.conf +++ b/mmfw-sysconf-target-tw2/etc/asound.conf @@ -1,50 +1,11 @@ -pcm. !default { - type asym - playback.pcm { - type hw - card 0 - device 0 - } - capture.pcm { - type hw - card 0 - device 0 - } -} +# default sound configuration -ctl. !default { - type hw - card 0 -} - -pcm. AIF2{ - type hw - card 0 - device 1 - format S16_LE - channels 2 - rate 8000 -} - -pcm. AIF3{ - type hw - card 0 - device 2 - format S16_LE - channels 2 - rate 8000 -} - -pcm. AIF4{ +pcm. !default { type hw card 0 - device 4 - format S16_LE - channels 2 - rate 44100 } -ctl. wm1811 { +ctl. !default { type hw card 0 } diff --git a/mmfw-sysconf-target-u3/etc/asound.conf b/mmfw-sysconf-target-u3/etc/asound.conf index f717a3e..acaf318 100644 --- a/mmfw-sysconf-target-u3/etc/asound.conf +++ b/mmfw-sysconf-target-u3/etc/asound.conf @@ -1,50 +1,11 @@ -pcm. !default { - type asym - playback.pcm { - type hw - card 0 - device 0 - } - capture.pcm { - type hw - card 0 - device 0 - } -} +# default sound configuration -ctl. !default { - type hw - card 0 -} - -pcm. AIF2{ - type hw - card 0 - device 1 - format S16_LE - channels 2 - rate 8000 -} - -pcm. AIF3{ - type hw - card 0 - device 2 - format S16_LE - channels 2 - rate 8000 -} - -pcm. AIF4{ +pcm. !default { type hw card 0 - device 4 - format S16_LE - channels 2 - rate 44100 } -ctl. wm1811 { +ctl. !default { type hw card 0 } diff --git a/packaging/mmfw-sysconf.spec b/packaging/mmfw-sysconf.spec index 7ab6d8b..dcb18b1 100644 --- a/packaging/mmfw-sysconf.spec +++ b/packaging/mmfw-sysconf.spec @@ -1,6 +1,6 @@ Name: mmfw-sysconf Summary: Multimedia Framework system configuration package -Version: 0.2.114 +Version: 0.2.115 Release: 0 Group: Multimedia/Configuration License: LGPL-2.1 and Apache-2.0 -- 2.7.4