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 deleted file mode 100644 index 40562a3bd9..0000000000 --- a/packages/audio/alsa/config/asound.conf.sample/asound.conf_ZBOX-HD-ID11.sample +++ /dev/null @@ -1,10 +0,0 @@ -# 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.sample/asound.conf_double-analog-hdmi.sample b/packages/audio/alsa/config/asound.conf.sample/asound.conf_double-analog-hdmi.sample deleted file mode 100644 index ac98c38337..0000000000 --- a/packages/audio/alsa/config/asound.conf.sample/asound.conf_double-analog-hdmi.sample +++ /dev/null @@ -1,68 +0,0 @@ -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 "hdmi_hw" - channels 2 - } - slaves.b { - 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 -} - -pcm.hdmi_hw { - type hw - card 1 - device 9 - 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.analog_hw { - type hw - card 0 - device 0 - channels 2 -} diff --git a/packages/audio/alsa/config/asound.conf.sample/asound.conf_double-analog-hdmi_dmix.sample b/packages/audio/alsa/config/asound.conf.sample/asound.conf_double-analog-hdmi_dmix.sample deleted file mode 100644 index 09a68cf79b..0000000000 --- a/packages/audio/alsa/config/asound.conf.sample/asound.conf_double-analog-hdmi_dmix.sample +++ /dev/null @@ -1,76 +0,0 @@ -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 "hdmi_hw" - channels 2 - } - slaves.b { - 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 -} - -pcm.hdmi_hw { - type dmix - ipc_key 1000 - slave { - pcm "hw:1,9" - period_time 0 - period_size 512 - buffer_size 2048 - } -} - -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.analog_hw { - type dmix - ipc_key 1001 - slave { - pcm "hw:0,0" - period_time 0 - period_size 512 - buffer_size 2048 - } -} diff --git a/packages/audio/alsa/config/asound.conf.sample/asound.conf_double-revo.sample b/packages/audio/alsa/config/asound.conf.sample/asound.conf_double-revo.sample deleted file mode 100644 index 4d6749da0e..0000000000 --- a/packages/audio/alsa/config/asound.conf.sample/asound.conf_double-revo.sample +++ /dev/null @@ -1,248 +0,0 @@ -# http://forum.xbmc.org/showpost.php?p=599791&postcount=41 - -# ALSA configuration file - -##### USAGE ##### -# Save this file as "~/.asoundrc" (for user-specific sound configuration) or -# "/etc/asound.conf" (for system-wide sound configuration) and specify ALSA -# device names ad described in the next section. - - -##### DEVICE NAMES ##### -# This configuration file defines four devices for use by the user. Those -# devices are "analog", "mixed-analog", "digital", and "mixed-digital". The -# user may also re-define "default" to be identical to one of the above-named -# devices (i.e. to send all sound output to the digital output unless otherwise -# specified). Use the device names as described below: -# - "analog" outputs to the analog output directly and (at least on software -# sound cards) blocks other audio output. After playback completes, "queued" -# sounds are output in sequence. -# - "mixed-analog" mixes audio output from multiple programs into the analog -# output (so you can hear beeps, alerts, and other noises while playing back -# an audio stream). -# - "digital" outputs to the digital output directly. Since most (all?) -# digital outputs expect 48kHz PCM audio, this may not work for some playback -# (i.e. CD's--which are 44.1kHz PCM audio--or 32kHz audio streams from TV -# recordings, etc.). -# - "mixed-digital" - -# All other devices created within this file are used only by the configuration -# file itself and should /not/ be used directly. In other words, do not use -# the devices "analog-hw", "dmix-analog", "digital-hw", or "dmix-digital". - - -##### IMPORTANT ##### -# To make this ALSA configuration file work with your sound card, you will need -# to define the appropriate card and device information for the "analog-hw" and -# "digital-hw" devices below. You can find the card and device information -# using "aplay -l". - -# Alias for (converted) analog output on the card -# - This is identical to the device named "default"--which always exists and -# refers to hw:0,0 (unless overridden) -# - Therefore, we can specify "hw:0,0", "default", or "analog" to access analog -# output on the card -# - Note that as of ALSA 1.0.9, "software" sound card definitions redefine -# "default" to do mixing, meaning this device is different from "default" and -# allows playback while blocking other sound sources (until playback -# completes). -pcm.analog { - type plug - slave.pcm "analog-hw" - hint { - show on - description "Analog Output - Use analog outputs, converting samples, format, and rate as necessary." - } -} - -# Control device (mixer, etc.) for the card -ctl.analog { - type hw - card 0 -} - -# Alias for (converted) mixed analog output on the card -# - This will accept audio input--regardless of rate--and convert to the rate -# required for the dmix plugin (in this case 48000Hz) -# - Note that as of ALSA 1.0.9, "software" sound card definitions redefine -# "default" to do mixing, meaning this device is identical to "default" for -# "software" sound cards. -pcm.mixed-analog { - type plug - slave.pcm "dmix-analog" - hint { - show on - description "Mixed Analog Output - Use analog outputs, converting samples, format, and rate as necessary. Allows mixing with system sounds." - } -} - -# Control device (mixer, etc.) for the card -ctl.mixed-analog { - type hw - card 0 -} - -# Alias for (converted) digital (HDMI) output on the card -pcm.digital { - type plug - slave.pcm "digital-hw" - hint { - show on - description "Digital Output - Use digital outputs, converting samples, format, and rate as necessary." - } -} - -# Control device (mixer, etc.) for the card -ctl.digital { - type hw - card 0 -} - -# Alias for mixed (converted) digital (HDMI) output on the card - -pcm.mixed-digital { - type plug - slave.pcm "dmix-digital" - hint { - show on - description "Mixed Digital Output - Use digital outputs, converting samples, format, and rate as necessary. Allows mixing with system sounds." - } -} - -# Control device (mixer, etc.) for the card -ctl.mixed-digital { - type hw - card 0 -} - -# The following devices are not useful by themselves. They require specific -# rates, channels, and formats. Therefore, you probably do not want to use -# them directly. Instead use of of the devices defined above. - -# Alias for analog output on the card -# Do not use this directly--it requires specific rate, channels, and format -pcm.analog-hw { - type hw - card 0 - device 0 -} - -# Control device (mixer, etc.) for the card -ctl.analog-hw { - type hw - card 0 -} - -# Alias for digital (HDMI) output on the card -# Do not use this directly--it requires specific rate, channels, and format -pcm.digital-hw { - type hw - card 0 - device 3 -} - -# Control device (mixer, etc.) for the card -ctl.digital-hw { - type hw - card 0 -} - -# Direct software mixing plugin for analog output on the card -# Do not use this directly--it requires specific rate, channels, and format -pcm.dmix-analog { - type dmix - ipc_key 1234 - slave { - pcm "analog-hw" - period_time 0 - period_size 1024 - buffer_size 4096 - rate 48000 - } -} - -# Control device (mixer, etc.) for the card -ctl.dmix-analog { - type hw - card 0 -} - -# Direct software mixing plugin for digital (S/PDIF) output on the card -# Do not use this directly--it requires specific rate, channels, and format -pcm.dmix-digital { - type dmix - ipc_key 1235 - slave { - pcm "digital-hw" - period_time 0 - period_size 1024 - buffer_size 4096 - rate 48000 - } -} - -# Control device (mixer, etc.) for the card -ctl.dmix-digital { - type hw - card 0 -} - -# Make joint analog/HDMI the default -pcm.!default { - type plug - slave { - pcm multi - rate 48000 - } - ttable.0.0 1.0 - ttable.1.1 1.0 - ttable.0.2 1.0 - ttable.1.3 1.0 -} - -# Control device (mixer, etc.) for the card -ctl.!default { - type hw - card 0 -} - -pcm.xbmc { - type plug - slave { - pcm multi - rate 48000 - channels 4 - } - ttable.0.0 1.0 - ttable.1.1 1.0 - ttable.0.2 1.0 - ttable.1.3 1.0 -} - - -ctl.xbmc { - type hw - card 0 -} - -pcm.multi { - type multi - slaves.a.pcm "analog-hw" - slaves.a.channels 2 - slaves.b.pcm "digital-hw" - slaves.b.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 -} - -ctl.multi { - type hw - card 0 -} - diff --git a/packages/audio/alsa/config/asound.conf.sample/asound.conf_double-xs35gt.sample b/packages/audio/alsa/config/asound.conf.sample/asound.conf_double-xs35gt.sample deleted file mode 100644 index f855b46cfc..0000000000 --- a/packages/audio/alsa/config/asound.conf.sample/asound.conf_double-xs35gt.sample +++ /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/packages/audio/alsa/config/asound.conf.sample/asound.conf_fusion.sample b/packages/audio/alsa/config/asound.conf.sample/asound.conf_fusion.sample deleted file mode 100644 index 66751a5c1d..0000000000 --- a/packages/audio/alsa/config/asound.conf.sample/asound.conf_fusion.sample +++ /dev/null @@ -1,9 +0,0 @@ -pcm.!default { - type plug - slave { -# pcm "hw:1,0" #delete the first hash for sound over analog -# pcm "hw:1,1" #delete the first hash for sound over optical -# pcm "hw:0,3" #delete the first hash for sound over hdmi - rate 48000 - } -} diff --git a/packages/audio/alsa/config/asound.conf.sample/asound.conf_fusion_dmix.sample b/packages/audio/alsa/config/asound.conf.sample/asound.conf_fusion_dmix.sample deleted file mode 100644 index 5894cd0d7d..0000000000 --- a/packages/audio/alsa/config/asound.conf.sample/asound.conf_fusion_dmix.sample +++ /dev/null @@ -1,96 +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 dmix - ipc_key 1000 - slave { - pcm "hw:0,3" - period_time 0 - period_size 512 - buffer_size 2048 - } -} - - pcm.hdmi_formatted { - type plug - slave { - pcm hdmi_hw - channels 2 - } -} - -pcm.hdmi_complete { - type softvol - slave.pcm hdmi_formatted - control.name hdmi_volume - control.card 1 -} - -pcm.digital_hw { - type dmix - ipc_key 1001 - slave { - pcm "hw:1,1" - period_time 0 - period_size 512 - buffer_size 2048 - } -} - -pcm.analog_hw { - type dmix - ipc_key 1002 - slave { - pcm "hw:1,0" - period_time 0 - period_size 512 - buffer_size 2048 - } -} diff --git a/packages/audio/alsa/config/asound.conf.sample/asound.conf_menusound.sample b/packages/audio/alsa/config/asound.conf.sample/asound.conf_menusound.sample deleted file mode 100644 index faac879698..0000000000 --- a/packages/audio/alsa/config/asound.conf.sample/asound.conf_menusound.sample +++ /dev/null @@ -1,69 +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 "tv" -channels 2 -} -slaves.b { -pcm "receiver" -channels 2 -} -slaves.c { -pcm "analog" -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.tv { -type hw -card 0 -device 3 -channels 2 -} - -pcm.receiver { -type hw -card 0 -device 1 -channels 2 -} - -pcm.analog { -type hw -card 0 -device 0 -channels 2 -} diff --git a/packages/audio/alsa/config/asound.conf.sample/asound.conf_triple.sample b/packages/audio/alsa/config/asound.conf.sample/asound.conf_triple.sample deleted file mode 100644 index f214e3c83f..0000000000 --- a/packages/audio/alsa/config/asound.conf.sample/asound.conf_triple.sample +++ /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/packages/audio/alsa/config/asound.conf.sample/asound.conf_triple_dmix.sample b/packages/audio/alsa/config/asound.conf.sample/asound.conf_triple_dmix.sample deleted file mode 100644 index 2220e243bc..0000000000 --- a/packages/audio/alsa/config/asound.conf.sample/asound.conf_triple_dmix.sample +++ /dev/null @@ -1,96 +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 dmix - ipc_key 1000 - slave { - pcm "hw:1,7" - period_time 0 - period_size 512 - buffer_size 2048 - } -} - -pcm.hdmi_formatted { - type plug - slave { - pcm hdmi_hw - channels 2 - } -} - -pcm.hdmi_complete { - type softvol - slave.pcm hdmi_formatted - control.name hdmi_volume - control.card 1 -} - -pcm.digital_hw { - type dmix - ipc_key 1001 - slave { - pcm "hw:0,1" - period_time 0 - period_size 512 - buffer_size 2048 - } -} - -pcm.analog_hw { - type dmix - ipc_key 1002 - slave { - pcm "hw:0,0" - period_time 0 - period_size 512 - buffer_size 2048 - } -} 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 deleted file mode 100644 index cc29231304..0000000000 --- a/packages/audio/alsa/config/modprobe.d.sample/sound.conf_ZBOX-HD-ID11.sample +++ /dev/null @@ -1,4 +0,0 @@ -# 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 8bd0e9777f..99930fb0e2 100755 --- a/packages/audio/alsa/install +++ b/packages/audio/alsa/install @@ -24,6 +24,3 @@ mkdir -p $INSTALL/etc/modprobe.d cp -P $PKG_DIR/config/alsa-base.conf $INSTALL/etc/modprobe.d - -mkdir -p $INSTALL/usr/config - cp -R $PKG_DIR/config/*.sample $INSTALL/usr/config