From ea86c07fe378c2afa8f11fe59d3b83a366e4fbd9 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Tue, 4 Jan 2011 01:39:19 +0100
Subject: [PATCH] alsa: move samplefiles in own sample dirs, add samples for
 ZBOX HD-ID11

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 .../asound.conf.sample/asound.conf_ZBOX-HD-ID11.sample | 10 ++++++++++
 .../asound.conf_double-revo.sample                     |  0
 .../asound.conf_double-xs35gt.sample                   |  0
 .../asound.conf_menusound.sample                       |  0
 .../{ => asound.conf.sample}/asound.conf_triple.sample |  0
 .../modprobe.d.sample/sound.conf_ZBOX-HD-ID11.sample   |  4 ++++
 packages/audio/alsa/install                            |  2 +-
 7 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 packages/audio/alsa/config/asound.conf.sample/asound.conf_ZBOX-HD-ID11.sample
 rename packages/audio/alsa/config/{ => asound.conf.sample}/asound.conf_double-revo.sample (100%)
 rename packages/audio/alsa/config/{ => asound.conf.sample}/asound.conf_double-xs35gt.sample (100%)
 rename packages/audio/alsa/config/{ => asound.conf.sample}/asound.conf_menusound.sample (100%)
 rename packages/audio/alsa/config/{ => asound.conf.sample}/asound.conf_triple.sample (100%)
 create mode 100644 packages/audio/alsa/config/modprobe.d.sample/sound.conf_ZBOX-HD-ID11.sample

diff --git a/packages/audio/alsa/config/asound.conf.sample/asound.conf_ZBOX-HD-ID11.sample b/packages/audio/alsa/config/asound.conf.sample/asound.conf_ZBOX-HD-ID11.sample
new file mode 100644
index 0000000000..40562a3bd9
--- /dev/null
+++ b/packages/audio/alsa/config/asound.conf.sample/asound.conf_ZBOX-HD-ID11.sample
@@ -0,0 +1,10 @@
+# modprobe.d config for Zotac ZBOX HD-ID11
+# This file is part of OpenELEC, many thanks to 'Dampfgarten'
+#
+# XBMC config:
+# SYSTEM -> System -> Audio-Hardware
+# Audio Ausgabegerät: HDA NVidia hdmi
+# Digitales Ausgabegerät für Passthrough: HDA NVidia hdmi
+
+pcm.!default hdmi:NVidia
+pcm:iec958 hdmi:NVidia
diff --git a/packages/audio/alsa/config/asound.conf_double-revo.sample b/packages/audio/alsa/config/asound.conf.sample/asound.conf_double-revo.sample
similarity index 100%
rename from packages/audio/alsa/config/asound.conf_double-revo.sample
rename to packages/audio/alsa/config/asound.conf.sample/asound.conf_double-revo.sample
diff --git a/packages/audio/alsa/config/asound.conf_double-xs35gt.sample b/packages/audio/alsa/config/asound.conf.sample/asound.conf_double-xs35gt.sample
similarity index 100%
rename from packages/audio/alsa/config/asound.conf_double-xs35gt.sample
rename to packages/audio/alsa/config/asound.conf.sample/asound.conf_double-xs35gt.sample
diff --git a/packages/audio/alsa/config/asound.conf_menusound.sample b/packages/audio/alsa/config/asound.conf.sample/asound.conf_menusound.sample
similarity index 100%
rename from packages/audio/alsa/config/asound.conf_menusound.sample
rename to packages/audio/alsa/config/asound.conf.sample/asound.conf_menusound.sample
diff --git a/packages/audio/alsa/config/asound.conf_triple.sample b/packages/audio/alsa/config/asound.conf.sample/asound.conf_triple.sample
similarity index 100%
rename from packages/audio/alsa/config/asound.conf_triple.sample
rename to packages/audio/alsa/config/asound.conf.sample/asound.conf_triple.sample
diff --git a/packages/audio/alsa/config/modprobe.d.sample/sound.conf_ZBOX-HD-ID11.sample b/packages/audio/alsa/config/modprobe.d.sample/sound.conf_ZBOX-HD-ID11.sample
new file mode 100644
index 0000000000..cc29231304
--- /dev/null
+++ b/packages/audio/alsa/config/modprobe.d.sample/sound.conf_ZBOX-HD-ID11.sample
@@ -0,0 +1,4 @@
+# modprobe.d config for Zotac ZBOX HD-ID11
+# This file is part of OpenELEC, many thanks to 'Dampfgarten'
+
+options snd-hda-intel enable_msi=0 probe_mask=0xffff,0xfff2
\ No newline at end of file
diff --git a/packages/audio/alsa/install b/packages/audio/alsa/install
index 571a9e5790..9cfa759835 100755
--- a/packages/audio/alsa/install
+++ b/packages/audio/alsa/install
@@ -6,4 +6,4 @@ mkdir -p $INSTALL/etc/modprobe.d
   cp -P $PKG_DIR/config/alsa-base.conf $INSTALL/etc/modprobe.d
 
 mkdir -p $INSTALL/usr/config
-  cp $PKG_DIR/config/*.sample $INSTALL/usr/config
+  cp -R $PKG_DIR/config/*.sample $INSTALL/usr/config