summaryrefslogtreecommitdiffstats
path: root/remote/modules/vmchooser2/data
diff options
context:
space:
mode:
authorSimon Rettberg2014-09-29 16:05:53 +0200
committerroot2014-09-29 16:05:53 +0200
commitadc62a87e207bfc5add709672ba031e78b309363 (patch)
treef0601834f0fb3811f8e04a6a35c97a0cdf313fe0 /remote/modules/vmchooser2/data
parent[alsa] Set default sound card to first non-HDMI card (diff)
downloadtm-scripts-adc62a87e207bfc5add709672ba031e78b309363.tar.gz
tm-scripts-adc62a87e207bfc5add709672ba031e78b309363.tar.xz
tm-scripts-adc62a87e207bfc5add709672ba031e78b309363.zip
[vmchooser*] Sync vmchooser-run_virt scripts
Diffstat (limited to 'remote/modules/vmchooser2/data')
-rwxr-xr-xremote/modules/vmchooser2/data/opt/openslx/scripts/vmchooser-run_virt3
1 files changed, 2 insertions, 1 deletions
diff --git a/remote/modules/vmchooser2/data/opt/openslx/scripts/vmchooser-run_virt b/remote/modules/vmchooser2/data/opt/openslx/scripts/vmchooser-run_virt
index 59cddfed..231ef6fe 100755
--- a/remote/modules/vmchooser2/data/opt/openslx/scripts/vmchooser-run_virt
+++ b/remote/modules/vmchooser2/data/opt/openslx/scripts/vmchooser-run_virt
@@ -446,6 +446,7 @@ amixer -q sset Front "$VOL" unmute 2>/dev/null
amixer -q sset Speaker "$VOL" unmute 2>/dev/null # annoying built-in speaker
amixer -q sset 'Front Mic' "$VOL" unmute 2>/dev/null # to be checked if Mic is actually activated
amixer -q sset 'Rear Mic' "$VOL" unmute 2>/dev/null # =""=
+amixer -q sset 'Capture' "$VOL" cap unmute 2>/dev/null # to be checked if Mic is actually activated
amixer -q -c pcsp sset Master "0%" mute 2>/dev/null # fix random static noise when starting vmplayer when module snd_pcsp (not pcspkr) is loaded
# Start printer daemon
@@ -482,7 +483,7 @@ PID_LPD="$!"
# via virtual floppy
cp "$xmlfile" "$VMCHOOSER_DIR/fd-loop/config.xml"
# Add another file with resolution information
-xrandr | grep -o -E 'connected\s*[0-9]+x[0-9]+\+0\+0' | grep -o -E '[0-9]+x[0-9]+' | head -n 1 > "$VMCHOOSER_DIR/fd-loop/hostres.txt"
+xrandr | grep -o -E 'connected\s*(primary)?\s*[0-9]+x[0-9]+\+0\+0' | grep -o -E '[0-9]+x[0-9]+' | head -n 1 > "$VMCHOOSER_DIR/fd-loop/hostres.txt"
# Add our magic openslx binary that sets the correct guest resolution
cp "$VMCHOOSER_DIR/data/openslx.exe" "$VMCHOOSER_DIR/fd-loop/"