[Audio] Update default alsa configuration (/etc/asound.conf) properly

[Version] 0.2.115
[Profile] Common
[Issue Type] Revise

Change-Id: I8285a861627fadc711dd8f781b7c4e155b9261f5
(cherry picked from commit 179c384901c36f28aea76714f1d6abd9d64c9097)

diff --git a/mmfw-sysconf-simulator/etc/asound.conf b/mmfw-sysconf-simulator/etc/asound.conf
index 5b99392d5cc9e0ee3e6db7e44b5646758fca54c0..86fa89542f634d670b7acc2d9d98d774923cfa26 100644 (file)
--- 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 f717a3ebf611745b53483d0b9de26ca688833b3c..acaf318216669fd92deb1514cab27b3fea85c157 100644 (file)
--- 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 f717a3ebf611745b53483d0b9de26ca688833b3c..acaf318216669fd92deb1514cab27b3fea85c157 100644 (file)
--- 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 f717a3ebf611745b53483d0b9de26ca688833b3c..a62fb605aefa93d6c266574abf6f0e1d71761855 100644 (file)
--- 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 f717a3ebf611745b53483d0b9de26ca688833b3c..acaf318216669fd92deb1514cab27b3fea85c157 100644 (file)
--- 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 f717a3ebf611745b53483d0b9de26ca688833b3c..acaf318216669fd92deb1514cab27b3fea85c157 100644 (file)
--- 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 f717a3ebf611745b53483d0b9de26ca688833b3c..acaf318216669fd92deb1514cab27b3fea85c157 100644 (file)
--- 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 7ab6d8b13cdb8c5479f821074eead8004e159e3c..dcb18b1e524f88729837776808ca2fed647e5bc3 100644 (file)
--- 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