diff --git a/projects/Ultra/filesystem/etc/asound.conf b/projects/Ultra/filesystem/etc/asound.conf deleted file mode 100644 index f855b46cfc..0000000000 --- a/projects/Ultra/filesystem/etc/asound.conf +++ /dev/null @@ -1,58 +0,0 @@ -# asound.conf for Shuttle XS35GT -# http://forum.xbmc.org/showpost.php?p=635394&postcount=330 -# in XBMC, set "audio output device" to custom -# insert "pcm.both" into the text box - -pcm.!default { - type plug - slave { - pcm both - } -} - -pcm.both { - type route - slave { - pcm multi - channels 4 - } - ttable.0.0 1.0 - ttable.1.1 1.0 - ttable.0.2 1.0 - ttable.1.3 1.0 -} - -pcm.multi { - type multi - slaves.a { - pcm tv - channels 2 - } - slaves.b { - pcm receiver - channels 2 - } - bindings.0.slave a - bindings.0.channel 0 - bindings.1.slave a - bindings.1.channel 1 - bindings.2.slave b - bindings.2.channel 0 - bindings.3.slave b - bindings.3.channel 1 -} - -pcm.receiver { - type hw - card 0 - device 0 - channels 2 -} - -pcm.tv { - type hw - card 1 - device 7 - channels 2 -} - diff --git a/projects/Ultra/filesystem/etc/init.d/03_oemscript b/projects/Ultra/filesystem/etc/init.d/03_oemscript new file mode 100644 index 0000000000..bb9f5a3883 --- /dev/null +++ b/projects/Ultra/filesystem/etc/init.d/03_oemscript @@ -0,0 +1,44 @@ +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +# +# OEM scripts +# +# runlevels: openelec, installer, textmode + +if [ ! -f /etc/asound.conf -a ! -f $HOME/.config/asound.conf ]; then + + DMI_BOARD_VENDOR=`cat /sys/class/dmi/id/board_vendor` + DMI_BOARD_VERSION=`cat /sys/class/dmi/id/board_version` + + if [ "$DMI_BOARD_VENDOR" = "XtReAmEr" ]; then + if [ "$DMI_BOARD_VERSION" = "To be filled by O.E.M." ]; then + + # Xtreamer Ultra 1 + cp /usr/share/xtreamer/asound.conf.ultra1 /run/asound.conf + + elif [ "$DMI_BOARD_VERSION" = "Xtreamer" ]; then + + # Xtreamer Ultra 2 + cp /usr/share/xtreamer/asound.conf.ultra2 /run/asound.conf + + fi + fi +fi \ No newline at end of file diff --git a/projects/Ultra/filesystem/usr/share/xtreamer/asound.conf.ultra1 b/projects/Ultra/filesystem/usr/share/xtreamer/asound.conf.ultra1 new file mode 100644 index 0000000000..f214e3c83f --- /dev/null +++ b/projects/Ultra/filesystem/usr/share/xtreamer/asound.conf.ultra1 @@ -0,0 +1,85 @@ +pcm.!default { + type plug + slave { + pcm "both" + } +} + +pcm.both { + type route + slave { + pcm multi + channels 6 + } + ttable.0.0 1.0 + ttable.1.1 1.0 + ttable.0.2 1.0 + ttable.1.3 1.0 + ttable.0.4 1.0 + ttable.1.5 1.0 +} + +pcm.multi { + type multi + slaves.a { + pcm "hdmi_hw" + channels 2 + } + slaves.b { + pcm "digital_hw" + channels 2 + } + slaves.c { + pcm "analog_hw" + channels 2 + } + bindings.0.slave a + bindings.0.channel 0 + bindings.1.slave a + bindings.1.channel 1 + bindings.2.slave b + bindings.2.channel 0 + bindings.3.slave b + bindings.3.channel 1 + bindings.4.slave c + bindings.4.channel 0 + bindings.5.slave c + bindings.5.channel 1 +} + +pcm.hdmi_hw { + type hw + card 1 + device 7 + channels 2 +} + +pcm.hdmi_formatted { + type plug + slave { + pcm hdmi_hw + rate 48000 + channels 2 + } +} + +pcm.hdmi_complete { + type softvol + slave.pcm hdmi_formatted + control.name hdmi_volume + control.card 1 +} + +pcm.digital_hw { + type hw + card 0 + device 1 + channels 2 +} + +pcm.analog_hw { + type hw + card 0 + device 0 + channels 2 +} diff --git a/projects/Ultra/filesystem/usr/share/xtreamer/asound.conf.ultra2 b/projects/Ultra/filesystem/usr/share/xtreamer/asound.conf.ultra2 new file mode 100644 index 0000000000..8ea89e09c1 --- /dev/null +++ b/projects/Ultra/filesystem/usr/share/xtreamer/asound.conf.ultra2 @@ -0,0 +1,85 @@ +pcm.!default { + type plug + slave { + pcm "both" + } +} + +pcm.both { + type route + slave { + pcm multi + channels 6 + } + ttable.0.0 1.0 + ttable.1.1 1.0 + ttable.0.2 1.0 + ttable.1.3 1.0 + ttable.0.4 1.0 + ttable.1.5 1.0 +} + +pcm.multi { + type multi + slaves.a { + pcm "hdmi_hw" + channels 2 + } + slaves.b { + pcm "digital_hw" + channels 2 + } + slaves.c { + pcm "analog_hw" + channels 2 + } + bindings.0.slave a + bindings.0.channel 0 + bindings.1.slave a + bindings.1.channel 1 + bindings.2.slave b + bindings.2.channel 0 + bindings.3.slave b + bindings.3.channel 1 + bindings.4.slave c + bindings.4.channel 0 + bindings.5.slave c + bindings.5.channel 1 +} + +pcm.hdmi_hw { + type hw + card 1 + device 3 + channels 2 +} + +pcm.hdmi_formatted { + type plug + slave { + pcm hdmi_hw + rate 48000 + channels 2 + } +} + +pcm.hdmi_complete { + type softvol + slave.pcm hdmi_formatted + control.name hdmi_volume + control.card 1 +} + +pcm.digital_hw { + type hw + card 0 + device 1 + channels 2 +} + +pcm.analog_hw { + type hw + card 0 + device 0 + channels 2 +}