diff --git a/src/util.cpp b/src/util.cpp
index 0e523ad8a2..4ed54aab29 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -415,6 +415,11 @@ CAboutDlg::CAboutDlg ( QWidget* parent ) : CBaseDlg ( parent )
", https://www.qt.io
"
"Opus Interactive Audio Codec"
", https://www.opus-codec.org
"
+# if defined( _WIN32 ) && !defined( WITH_JACK )
+ "ASIO (Audio Stream I/O) SDK"
+ ", https://www.steinberg.net/developers
" +
+ "ASIO is a trademark and software of Steinberg Media Technologies GmbH
"
+# endif
"" +
tr ( "Audio reverberation code by Perry R. Cook and Gary P. Scavone" ) +
", 1995 - 2021, "
@@ -1411,6 +1416,11 @@ QString GetVersionAndNameStr ( const bool bDisplayInGui )
strVersionText += "\n *** Opus Interactive Audio Codec";
strVersionText += "\n *** ";
strVersionText += "\n *** ";
+#if defined( _WIN32 ) && !defined( WITH_JACK )
+ strVersionText += "\n *** ASIO (Audio Stream I/O) SDK";
+ strVersionText += "\n *** ";
+ strVersionText += "\n *** ";
+#endif
strVersionText += "\n *** Audio reverberation code by Perry R. Cook and Gary P. Scavone";
strVersionText += "\n *** ";
strVersionText += "\n *** ";
diff --git a/windows/installer-welcome-asio.bmp b/windows/installer-welcome-asio.bmp
new file mode 100644
index 0000000000..fbc2a3f6dc
Binary files /dev/null and b/windows/installer-welcome-asio.bmp differ
diff --git a/windows/installer.nsi b/windows/installer.nsi
index fde21f45a7..d0e6dc6cc6 100644
--- a/windows/installer.nsi
+++ b/windows/installer.nsi
@@ -54,8 +54,13 @@ BrandingText "${APP_NAME}. Make music online. With friends. For free."
!define SERVER_ICON "${WINDOWS_PATH}\jamulus-server-icon-2020.ico"
!define MUI_HEADERIMAGE
!define MUI_HEADERIMAGE_BITMAP "${WINDOWS_PATH}\installer-banner.bmp"
-!define MUI_WELCOMEFINISHPAGE_BITMAP "${WINDOWS_PATH}\installer-welcome.bmp"
-!define MUI_UNWELCOMEFINISHPAGE_BITMAP "${WINDOWS_PATH}\installer-welcome.bmp"
+!if ${BUILD_OPTION} == "jackonwindows"
+ !define MUI_WELCOMEFINISHPAGE_BITMAP "${WINDOWS_PATH}\installer-welcome.bmp"
+ !define MUI_UNWELCOMEFINISHPAGE_BITMAP "${WINDOWS_PATH}\installer-welcome.bmp"
+!else
+ !define MUI_WELCOMEFINISHPAGE_BITMAP "${WINDOWS_PATH}\installer-welcome-asio.bmp"
+ !define MUI_UNWELCOMEFINISHPAGE_BITMAP "${WINDOWS_PATH}\installer-welcome-asio.bmp"
+!endif
; Store the installer language - must be placed before the installer page configuration
!define MUI_LANGDLL_REGISTRY_ROOT HKLM
@@ -64,6 +69,10 @@ BrandingText "${APP_NAME}. Make music online. With friends. For free."
; Installer page configuration
!define MUI_PAGE_CUSTOMFUNCTION_PRE AbortOnRunningApp
+; Add ASIO label to Welcome Page when not using JACK
+!if ${BUILD_OPTION} != "jackonwindows"
+ !define MUI_PAGE_CUSTOMFUNCTION_SHOW WelcomeFinishShowASIO
+!endif
!insertmacro MUI_PAGE_WELCOME
; Display dialog based on BuildOption set
@@ -88,9 +97,17 @@ BrandingText "${APP_NAME}. Make music online. With friends. For free."
; Uninstaller page configuration
!define MUI_PAGE_CUSTOMFUNCTION_PRE un.AbortOnRunningApp
+; Add ASIO label to Welcome Page when not using JACK
+!if ${BUILD_OPTION} != "jackonwindows"
+ !define MUI_PAGE_CUSTOMFUNCTION_SHOW un.WelcomeFinishShowASIO
+!endif
!insertmacro MUI_UNPAGE_WELCOME
!insertmacro MUI_UNPAGE_CONFIRM
!insertmacro MUI_UNPAGE_INSTFILES
+; Add ASIO label to Finish Page when not using JACK
+!if ${BUILD_OPTION} != "jackonwindows"
+ !define MUI_PAGE_CUSTOMFUNCTION_SHOW un.WelcomeFinishShowASIO
+!endif
!insertmacro MUI_UNPAGE_FINISH
; Supported languages configuration
@@ -112,6 +129,21 @@ BrandingText "${APP_NAME}. Make music online. With friends. For free."
!macroend
+; Functions to update Welcome/Finish Page - Add Label for ASIO
+!if ${BUILD_OPTION} != "jackonwindows"
+ Function WelcomeFinishShowASIO
+ ${NSD_CreateLabel} 120u 168u 55% -20u "ASIO is a registered trademark of$\nSteinberg Media Technologies GmbH"
+ Pop $0
+ SetCtlColors $0 "" "transparent"
+ FunctionEnd
+
+ Function un.WelcomeFinishShowASIO
+ ${NSD_CreateLabel} 120u 168u 55% -20u "ASIO is a registered trademark of$\nSteinberg Media Technologies GmbH"
+ Pop $0
+ SetCtlColors $0 "" "transparent"
+ FunctionEnd
+!endif
+
; Define Dialog variables
Var Dialog
@@ -370,6 +402,11 @@ Function FinishPage.Show ; set the user choices if they were remembered
ShowWindow $mui.FinishPage.Run 1
+ !if ${BUILD_OPTION} != "jackonwindows"
+ ; Add ASIO label to dialog when not using JACK
+ Call WelcomeFinishShowASIO
+ !endif
+
FunctionEnd
Function FinishPage.Run ; run the app