From 285acff8801fe501fc5a40888006b048a5aca47c Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 24 Feb 2013 23:37:10 +0100 Subject: [PATCH] projects/Ultra/filesystem: remove not more needed default sound configs Signed-off-by: Stephan Raue --- .../Ultra/filesystem/etc/init.d/03_oemscript | 41 --------- .../usr/share/xtreamer/asound.conf.ultra1 | 85 ------------------- .../usr/share/xtreamer/asound.conf.ultra2 | 85 ------------------- 3 files changed, 211 deletions(-) delete mode 100644 projects/Ultra/filesystem/etc/init.d/03_oemscript delete mode 100644 projects/Ultra/filesystem/usr/share/xtreamer/asound.conf.ultra1 delete mode 100644 projects/Ultra/filesystem/usr/share/xtreamer/asound.conf.ultra2 diff --git a/projects/Ultra/filesystem/etc/init.d/03_oemscript b/projects/Ultra/filesystem/etc/init.d/03_oemscript deleted file mode 100644 index 17676f18c0..0000000000 --- a/projects/Ultra/filesystem/etc/init.d/03_oemscript +++ /dev/null @@ -1,41 +0,0 @@ -################################################################################ -# 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` - SYSTEM_CPU=`grep -m1 model /proc/cpuinfo | awk '{print $3}'` - - if [ "$DMI_BOARD_VENDOR" = "XtReAmEr" ]; then - if [ "$SYSTEM_CPU" = "28" ]; then - # Xtreamer Ultra 1 - cp /usr/share/xtreamer/asound.conf.ultra1 /run/asound.conf - elif [ "$SYSTEM_CPU" = "54" ]; then - # Xtreamer Ultra 2 - cp /usr/share/xtreamer/asound.conf.ultra2 /run/asound.conf - fi - fi -fi diff --git a/projects/Ultra/filesystem/usr/share/xtreamer/asound.conf.ultra1 b/projects/Ultra/filesystem/usr/share/xtreamer/asound.conf.ultra1 deleted file mode 100644 index f214e3c83f..0000000000 --- a/projects/Ultra/filesystem/usr/share/xtreamer/asound.conf.ultra1 +++ /dev/null @@ -1,85 +0,0 @@ -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 deleted file mode 100644 index 8ea89e09c1..0000000000 --- a/projects/Ultra/filesystem/usr/share/xtreamer/asound.conf.ultra2 +++ /dev/null @@ -1,85 +0,0 @@ -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 -}