summaryrefslogtreecommitdiffstats
path: root/remote/modules/vmware
diff options
context:
space:
mode:
authorJonathan Bauer2015-12-11 15:32:44 +0100
committerJonathan Bauer2015-12-11 15:32:44 +0100
commitb1bd22e44e6e99f5ab1f9da63f2eeb466c4e5006 (patch)
tree2f794672f9f5f428d6927c6f39fc89074c59ebe8 /remote/modules/vmware
parent[alsa] force usage of the non-HDMI sound card if we have more than one (diff)
downloadtm-scripts-b1bd22e44e6e99f5ab1f9da63f2eeb466c4e5006.tar.gz
tm-scripts-b1bd22e44e6e99f5ab1f9da63f2eeb466c4e5006.tar.xz
tm-scripts-b1bd22e44e6e99f5ab1f9da63f2eeb466c4e5006.zip
[vmware] removed >1 sound card logic since auto-detect in combination with asound.conf seems to work again
Diffstat (limited to 'remote/modules/vmware')
-rw-r--r--remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/set_hardware.inc9
-rw-r--r--remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/set_hardware_legacy.inc29
2 files changed, 3 insertions, 35 deletions
diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/set_hardware.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/set_hardware.inc
index 174bf314..a94f5b26 100644
--- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/set_hardware.inc
+++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/set_hardware.inc
@@ -16,13 +16,8 @@ esac
sound="es1371"
# set sound card explicitly if there is more than one card in the host system
-if [ -n "$SOUND_CARD_INDEX" ] && [ "$SOUND_CARD_INDEX" -ne 0 ]; then
- sound_fileName="sound.fileName = \"sysdefault:CARD=${SOUND_CARD_INDEX}\"
- sound.autodetect = \"FALSE\""
-else
- sound_fileName='sound.fileName = "-1"
- sound.autodetect = "TRUE"'
-fi
+sound_fileName='sound.fileName = "-1"
+sound.autodetect = "TRUE"'
# check for whitelisted HW-3D
source /opt/openslx/config
diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/set_hardware_legacy.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/set_hardware_legacy.inc
index baf75d93..899f5aea 100644
--- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/set_hardware_legacy.inc
+++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/set_hardware_legacy.inc
@@ -29,35 +29,8 @@ esac
sound="es1371"
# set sound card explicitly if there is more than one card in the host system
-if [ -n "$SOUND_CARD_INDEX" ] && [ "$SOUND_CARD_INDEX" -ne 0 ]; then
- sound_fileName="sound.fileName = \"sysdefault:CARD=${SOUND_CARD_INDEX}\"
-sound.autodetect = \"FALSE\""
-else
- sound_fileName='sound.fileName = "-1"
-sound.autodetect = "TRUE"'
-fi
-
-# check for 3D configuration setting
-case "$enable3d" in
- true|yes)
- enable3d="TRUE"
- ;;
- *)
- enable3d="FALSE"
- ;;
-esac
-
-# set standard sound card, overwrite depending on OS (options sb16, es1371, hdaudio)
-sound="es1371"
-
-# set sound card explicitly if there is more than one card in the host system
-if [ -n "$SOUND_CARD_INDEX" ] && [ "$SOUND_CARD_INDEX" -ne 0 ]; then
- sound_fileName="sound.fileName = \"sysdefault:CARD=${SOUND_CARD_INDEX}\"
-sound.autodetect = \"FALSE\""
-else
- sound_fileName='sound.fileName = "-1"
+sound_fileName='sound.fileName = "-1"
sound.autodetect = "TRUE"'
-fi
# check for 3D configuration setting
case "$enable3d" in