Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Include ASIO details in Windows ASIO version #2605

Merged
merged 1 commit into from
May 22, 2022
Merged

Include ASIO details in Windows ASIO version #2605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,11 @@ CAboutDlg::CAboutDlg ( QWidget* parent ) : CBaseDlg ( parent )
", <i><a href=\"https://www.qt.io\">https://www.qt.io</a></i></p>"
"<p>Opus Interactive Audio Codec"
", <i><a href=\"https://www.opus-codec.org\">https://www.opus-codec.org</a></i></p>"
# if defined( _WIN32 ) && !defined( WITH_JACK )
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm. Although not related, I think we should hava a "WITH_ASIO" default compile parameter instead of checking WITH_JACK everywhere...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps introduce the "WITH_ASIO" as part of audio redesign? Current reasoning is that the ASIO is just the default and therefore no need to define. Thinking if there will be a "no sound" option, it might help to add a "WITH_ASIO" define.

"<p>ASIO (Audio Stream I/O) SDK"
", <i><a href=\"https://www.steinberg.net/developers/\">https://www.steinberg.net/developers</a></i><br>" +
"ASIO is a trademark and software of Steinberg Media Technologies GmbH</p>"
# endif
"<p>" +
tr ( "Audio reverberation code by Perry R. Cook and Gary P. Scavone" ) +
", 1995 - 2021, <i><a href=\"https://ccrma.stanford.edu/software/stk\">"
Expand Down Expand Up @@ -1411,6 +1416,11 @@ QString GetVersionAndNameStr ( const bool bDisplayInGui )
strVersionText += "\n *** Opus Interactive Audio Codec";
strVersionText += "\n *** <https://www.opus-codec.org>";
strVersionText += "\n *** ";
#if defined( _WIN32 ) && !defined( WITH_JACK )
strVersionText += "\n *** ASIO (Audio Stream I/O) SDK";
strVersionText += "\n *** <https://www.steinberg.net/developers>";
strVersionText += "\n *** ";
#endif
strVersionText += "\n *** Audio reverberation code by Perry R. Cook and Gary P. Scavone";
strVersionText += "\n *** <https://ccrma.stanford.edu/software/stk>";
strVersionText += "\n *** ";
Expand Down
Binary file added windows/installer-welcome-asio.bmp
View file
Open in desktop
Binary file not shown.
41 changes: 39 additions & 2 deletions windows/installer.nsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down