From 0775e1656271e823fcee2d78422801b4bde497ba Mon Sep 17 00:00:00 2001
From: Itiligent <94789708+itiligent@users.noreply.github.com>
Date: Tue, 10 Sep 2024 12:03:09 +1000
Subject: [PATCH] enable sound & tofu to config file

also harmonised default RDP options to :
                +dynamic-resolution \
                +auto-reconnect \
                +home-drive \
                +clipboard \
                -wallpaper \
---
 README.md   |  4 ++--
 bin/winapps | 36 ++++++++++++++----------------------
 2 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index d3ce969..17823ce 100644
--- a/README.md
+++ b/README.md
@@ -365,9 +365,9 @@ WAFLAVOR="docker"
 RDP_SCALE="100"
 
 # [ADDITIONAL FREERDP FLAGS & ARGUMENTS]
-# DEFAULT VALUE: '' (BLANK)
+# DEFAULT VALUE: '/cert:tofu /sound /microphone'
 # VALID VALUES: See https://github.com/awakecoding/FreeRDP-Manuals/blob/master/User/FreeRDP-User-Manual.markdown
-RDP_FLAGS=""
+RDP_FLAGS="/cert:tofu /sound /microphone"
 
 # [MULTIPLE MONITORS]
 # NOTES:
diff --git a/bin/winapps b/bin/winapps
index 1563955..7fdedd3 100755
--- a/bin/winapps
+++ b/bin/winapps
@@ -513,8 +513,8 @@ function waRunCommand() {
             +dynamic-resolution \
             +auto-reconnect \
             +home-drive \
-            /sound \
-            /microphone \
+            +clipboard \
+            -wallpaper \
             /wm-class:"Microsoft Windows" \
             /t:"Windows RDP Session [$RDP_IP]" \
             /v:"$RDP_IP" &>/dev/null &
@@ -525,18 +525,15 @@ function waRunCommand() {
         # Open specified application.
         dprint "MANUAL: ${2}"
         $FREERDP_COMMAND \
-            /cert:tofu \
             /d:"$RDP_DOMAIN" \
             /u:"$RDP_USER" \
             /p:"$RDP_PASS" \
             /scale:"$RDP_SCALE" \
-            +auto-reconnect \
-            +clipboard \
-            +home-drive \
-            /sound \
-            /microphone \
-            -wallpaper \
             +dynamic-resolution \
+            +auto-reconnect \
+            +home-drive \
+            +clipboard \
+            -wallpaper \
             "$MULTI_FLAG" \
             /app:program:"$2" \
             /v:"$RDP_IP" &>/dev/null &
@@ -569,13 +566,11 @@ function waRunCommand() {
                 /u:"$RDP_USER" \
                 /p:"$RDP_PASS" \
                 /scale:"$RDP_SCALE" \
-                +auto-reconnect \
-                +clipboard \
-                +home-drive \
-                /sound \
-                /microphone \
-                -wallpaper \
                 +dynamic-resolution \
+                +auto-reconnect \
+                +home-drive \
+                +clipboard \
+                -wallpaper \
                 "$MULTI_FLAG" \
                 /wm-class:"$FULL_NAME" \
                 /app:program:"$WIN_EXECUTABLE",icon:"$ICON",name:"$FULL_NAME" \
@@ -592,18 +587,15 @@ function waRunCommand() {
             dprint "WINDOWS_FILE_PATH: ${FILE_PATH}"
 
             $FREERDP_COMMAND \
-                /cert:tofu \
                 /d:"$RDP_DOMAIN" \
                 /u:"$RDP_USER" \
                 /p:"$RDP_PASS" \
                 /scale:"$RDP_SCALE" \
-                +auto-reconnect \
-                +clipboard \
-                +home-drive \
-                /sound \
-                /microphone \
-                -wallpaper \
                 +dynamic-resolution \
+                +auto-reconnect \
+                +home-drive \
+                +clipboard \
+                -wallpaper \
                 "$MULTI_FLAG" \
                 /wm-class:"$FULL_NAME" \
                 /app:program:"$WIN_EXECUTABLE",icon:"$ICON",name:$"FULL_NAME",cmd:\""$FILE_PATH"\" \