emulator: alsa config to allow multiple source to play audio

Enable dmix plugin for also on emulator to allow playing audio
from multiple sources at the same time.

Remove copyright header from raspberrypi config file.

Task-number: QTEE-362
Change-Id: I4073ac0dae1f7af9a307eb3a455e9277181fb9a1
Reviewed-by: Rainer Keller <rainer.keller@digia.com>

2 files changed, 4 insertions, 22 deletions

diff --git a/recipes/alsa/alsa-state/emulator/asound.conf b/recipes/alsa/alsa-state/emulator/asound.conf
new file mode 100644
index 0000000..edd2e82
--- /dev/null
+++ b/recipes/alsa/alsa-state/emulator/asound.conf
@@ -0,0 +1,4 @@
+pcm.!default {
+    type plug
+    slave.pcm "dmix"
+}
diff --git a/recipes/alsa/alsa-state/raspberrypi/asound.conf b/recipes/alsa/alsa-state/raspberrypi/asound.conf
index ef44416..83f7f9a 100644
--- a/recipes/alsa/alsa-state/raspberrypi/asound.conf
+++ b/recipes/alsa/alsa-state/raspberrypi/asound.conf
@@ -1,25 +1,3 @@
-#############################################################################
-##
-## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-##
-## This file is part of the Qt Enterprise Embedded Scripts of the Qt
-## framework.
-##
-## $QT_BEGIN_LICENSE$
-## Commercial License Usage Only
-## Licensees holding valid commercial Qt license agreements with Digia
-## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
-## may use this file in accordance with the terms contained in said license
-## agreement.
-##
-## For further information use the contact form at
-## http://qt.digia.com/contact-us.
-##
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
 pcm.!default {
         type hw
         card 0