audiogame-manager.sh

@@ -540,7 +540,7 @@ install_wine_bottle() {
             { DISPLAY="" wineboot -u
             wine msiexec /i z:"$monoPath" /quiet
             wine msiexec /i z:"$geckoPath" /quiet
-            if [[ "${*}" =~ (speechsdk|sapi) ]]; then
+            if [[ "${*}" =~ speechsdk ]]; then
                 install_rhvoice
             fi
             if [[ "${WINEARCH}" == "win64" ]]; then
@@ -1064,7 +1064,7 @@ gameList=(
     "The Vale"
     "Thief"
     "Traders of Known Space"
-    "Three D velocity"
+    #"Three D velocity"
     "Tomb Hunter"
     "Top Speed 2"
     "Top Speed 3"
@@ -2719,16 +2719,13 @@ EOF
     ;;
     "Three D velocity")
         export winVer="win10"
-export WINEARCH=win64
-export norh=false # Must install a voice, and rhvoice works easily with 64 bit.
-        install_wine_bottle  sapi vcrun2008 gdiplus xact dotnet48 xna40
+        install_wine_bottle  speechsdk
         # Dotnet is evil. That is all.
-#        LC_ALL=C winetricks -q dotnet48 
-#        wineserver -k # Ha ha ha.
-        download "https://github.com/munawarb/Three-D-Velocity-Binaries/archive/master.zip" "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd64.dll" "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd32.dll"
+        LC_ALL=C winetricks -q dotnet472
+        wineserver -k # Ha ha ha.
+        download "https://github.com/munawarb/Three-D-Velocity-Binaries/archive/master.zip" "https://stormgames.wolfe.casa/downloads/nvdaControllerClient32.dll"
         unzip -d "$WINEPREFIX/drive_c/Program Files" "${cache}/master.zip"
-        find "${WINEPREFIX}" -type f -name 'nvdaControllerClient32.dll' -exec cp -v "${cache}/nvda2speechd32.dll" "{}" \;
-        find "${WINEPREFIX}" -type f -name 'nvdaControllerClient64.dll' -exec cp -v "${cache}/nvda2speechd64.dll" "{}" \;
+        find "${WINEPREFIX}" -type f -name 'nvdaControllerClient32.dll' -exec cp -v "${cache}/nvdaControllerClient32.dll" "{}" \;
         add_launcher "c:\Program Files\Three-D-Velocity-Binaries-master\tdv.exe"
     ;;
     "Triple Triad")

speech/clipboard_reader.sh

@@ -8,10 +8,6 @@ done
 unset cliptext
 socketFile="$(find /tmp -maxdepth 1 -name "orca-*.sock")"
 while pgrep -u "$USER" ^$1 &> /dev/null ; do
-    sleep 0.05
-    if [[ -f ~/.agmsilent ]]; then
-        continue
-    fi
     if [[ "$(uname)" == "Darwin" ]]; then
         tmp="$(pbpaste 2> /dev/null)"
     else
@@ -42,6 +38,7 @@ while pgrep -u "$USER" ^$1 &> /dev/null ; do
             fi
         fi
     fi
+    sleep 0.05
 done
 
 exit 0

speech/clipboard_translator.sh

@@ -25,9 +25,6 @@ translationFile="${XDG_CACHE_HOME:-$HOME/.cache}/audiogame-manager/${fileName}"
 while pgrep -u "$USER" ^$1 &> /dev/null ; do
     sleep 0.05
     text="$(xclip -d "${DISPLAY:-:0}" -selection clipboard -o 2> /dev/null)"
-    if [[ -f ~/.agmsilent ]]; then
-        continue
-    fi
     if [[ "${text}" =~ ^[0-9A-Za-z[:space:][:punct:]]+$ ]]; then
         spd-say -- "$text"
         echo "" | xclip -d "${DISPLAY:-:0}" -selection clipboard 2> /dev/null
@@ -78,5 +75,3 @@ EOF
     spd-say -- "$translated"
     echo "" | xclip -d "${DISPLAY:-:0}" -selection clipboard 2> /dev/null
 done
-
-exit 0

speech/install_nvda.sh

@@ -5,7 +5,7 @@ export WINEARCH=win32
 export WINEPREFIX=~/.local/wine/${1:-nvda}
 export winetricksPath="${XDG_DATA_HOME:-$HOME/.local/share}/audiogame-manager"
 
-${winetricksPath}/winetricks msaa riched20 riched30 win7
+${winetricksPath}winetricks msaa riched20 riched30 win7
 
 [[ -f ~/Downloads/nvda_2017.3.exe ]] || wget -O ~/Downloads/nvda_2017.3.exe https://www.nvaccess.org/download/nvda/releases/2017.3/nvda_2017.3.exe
 wine ~/Downloads/nvda_2017.3.exe

speech/set-voice.sh

@@ -194,7 +194,7 @@ for x in "${voiceListFullName[@]}" ; do
 done
 oldVoice="$($grep -P '"DefaultTokenId"="HKEY_LOCAL_MACHINE\\\\(SOFTWARE|Software)\\\\(Wow6432Node\\\\|)Microsoft\\\\Speech\\\\Voices\\\\Token(Enum|)s\\\\[^"]+"' "${WINEPREFIX}/user.reg" | $sed -E -e 's/"DefaultTokenId"="([^"]+)"/\1/g')"
 exit=1
-if [[ "${#voiceList[@]}" -eq 0 ]]; then
+if [[ "${voiceList[@]}" -eq 0 ]]; then
 dialog --msgbox "No voices found." -1 -1
 exit 1
 fi

speech/speak_window_title.sh

@@ -9,10 +9,6 @@ done
 
 # Read so long as the application is running
 while pgrep -u "$USER" ^$1 &> /dev/null ; do    
-    sleep 0.05
-    if [[ -f ~/.agmsilent ]]; then
-        continue
-    fi
     wnd_focus=$(xdotool getwindowfocus)
     wnd_title=$(xprop -id $wnd_focus WM_NAME)
     lookfor='"(.*)"'
@@ -24,6 +20,5 @@ while pgrep -u "$USER" ^$1 &> /dev/null ; do
             old_title="$wnd_title"
         fi
     fi
+    sleep 0.01
 done
-
-exit 0