#endif
@@ -101,6 +102,7 @@ class CClientDlg : public CBaseDlg, private Ui_CClientDlgBase
CClient* pClient;
CClientSettings* pSettings;
+ int iClients;
bool bConnected;
bool bConnectDlgWasShown;
bool bMIDICtrlUsed;
diff --git a/src/clientsettingsdlg.cpp b/src/clientsettingsdlg.cpp
index 8b2b50b851..1f0426cbb1 100644
--- a/src/clientsettingsdlg.cpp
+++ b/src/clientsettingsdlg.cpp
@@ -390,6 +390,14 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, CClientSettings* pNSet
chbDetectFeedback->setWhatsThis ( strDetectFeedback );
chbDetectFeedback->setAccessibleName ( tr ( "Feedback Protection check box" ) );
+ // audio alerts
+ QString strAudioAlerts = "" + tr ( "Audio Alerts" ) + ": " +
+ tr ( "Enable audio alert when receiving a chat message and when a new client joins the session. "
+ "A second sound device may be required to hear the alerts." );
+ lblAudioAlerts->setWhatsThis ( strAudioAlerts );
+ chbAudioAlerts->setWhatsThis ( strAudioAlerts );
+ chbAudioAlerts->setAccessibleName ( tr ( "Audio Alerts check box" ) );
+
// init driver button
#if defined( _WIN32 ) && !defined( WITH_JACK )
butDriverSetup->setText ( tr ( "ASIO Device Settings" ) );
@@ -470,6 +478,9 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, CClientSettings* pNSet
// init number of mixer rows
spnMixerRows->setValue ( pSettings->iNumMixerPanelRows );
+ // init audio alerts
+ chbAudioAlerts->setCheckState ( pSettings->bEnableAudioAlerts ? Qt::Checked : Qt::Unchecked );
+
// update feedback detection
chbDetectFeedback->setCheckState ( pSettings->bEnableFeedbackDetection ? Qt::Checked : Qt::Unchecked );
@@ -633,6 +644,8 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, CClientSettings* pNSet
QObject::connect ( chbDetectFeedback, &QCheckBox::stateChanged, this, &CClientSettingsDlg::OnFeedbackDetectionChanged );
+ QObject::connect ( chbAudioAlerts, &QCheckBox::stateChanged, this, &CClientSettingsDlg::OnAudioAlertsChanged );
+
// line edits
QObject::connect ( edtNewClientLevel, &QLineEdit::editingFinished, this, &CClientSettingsDlg::OnNewClientLevelEditingFinished );
@@ -984,6 +997,8 @@ void CClientSettingsDlg::OnMeterStyleActivated ( int iMeterStyleIdx )
UpdateDisplay();
}
+void CClientSettingsDlg::OnAudioAlertsChanged ( int value ) { pSettings->bEnableAudioAlerts = value == Qt::Checked; }
+
void CClientSettingsDlg::OnAutoJitBufStateChanged ( int value )
{
pClient->SetDoAutoSockBufSize ( value == Qt::Checked );
diff --git a/src/clientsettingsdlg.h b/src/clientsettingsdlg.h
index acdcf256ec..eb17c8ee78 100644
--- a/src/clientsettingsdlg.h
+++ b/src/clientsettingsdlg.h
@@ -96,6 +96,7 @@ public slots:
void OnAudioQualityActivated ( int iQualityIdx );
void OnGUIDesignActivated ( int iDesignIdx );
void OnMeterStyleActivated ( int iMeterStyleIdx );
+ void OnAudioAlertsChanged ( int value );
void OnLanguageChanged ( QString strLanguage ) { pSettings->strLanguage = strLanguage; }
void OnAliasTextChanged ( const QString& strNewName );
void OnInstrumentActivated ( int iCntryListItem );
@@ -114,6 +115,7 @@ public slots:
signals:
void GUIDesignChanged();
void MeterStyleChanged();
+ void AudioAlertsChanged();
void AudioChannelsChanged();
void CustomDirectoriesChanged();
void NumMixerPanelRowsChanged ( int value );
diff --git a/src/clientsettingsdlgbase.ui b/src/clientsettingsdlgbase.ui
index 847d32c550..ef6309c6bc 100644
--- a/src/clientsettingsdlgbase.ui
+++ b/src/clientsettingsdlgbase.ui
@@ -242,6 +242,13 @@
+ -
+
+
+ Audio Alerts
+
+
+
-
@@ -281,6 +288,13 @@
+ -
+
+
+ Enable
+
+
+
@@ -1283,6 +1297,7 @@
cbxMeterStyle
cbxLanguage
spnMixerRows
+ chbAudioAlerts
cbxSoundcard
butDriverSetup
cbxLInChan
diff --git a/src/res/sounds/new_message.wav b/src/res/sounds/new_message.wav
new file mode 100644
index 0000000000..b65fb365f6
Binary files /dev/null and b/src/res/sounds/new_message.wav differ
diff --git a/src/res/sounds/new_user.wav b/src/res/sounds/new_user.wav
new file mode 100644
index 0000000000..149f1748d5
Binary files /dev/null and b/src/res/sounds/new_user.wav differ
diff --git a/src/resources.qrc b/src/resources.qrc
index 7a1e45f82a..55d6a2b333 100644
--- a/src/resources.qrc
+++ b/src/resources.qrc
@@ -367,4 +367,8 @@
res/flags/zm.png
res/flags/zw.png
+
+ res/sounds/new_user.wav
+ res/sounds/new_message.wav
+
diff --git a/src/settings.cpp b/src/settings.cpp
index b858da4f9e..0510ce85e7 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -283,6 +283,12 @@ void CClientSettings::ReadSettingsFromXML ( const QDomDocument& IniXMLDocument,
iNumMixerPanelRows = iValue;
}
+ // audio alerts
+ if ( GetFlagIniSet ( IniXMLDocument, "client", "enableaudioalerts", bValue ) )
+ {
+ bEnableAudioAlerts = bValue;
+ }
+
// name
pClient->ChannelInfo.strName = FromBase64ToString (
GetIniSetting ( IniXMLDocument, "client", "name_base64", ToBase64 ( QCoreApplication::translate ( "CMusProfDlg", "No Name" ) ) ) );
@@ -634,6 +640,9 @@ void CClientSettings::WriteSettingsToXML ( QDomDocument& IniXMLDocument )
// number of mixer panel rows
SetNumericIniSet ( IniXMLDocument, "client", "numrowsmixpan", iNumMixerPanelRows );
+ // audio alerts
+ SetFlagIniSet ( IniXMLDocument, "client", "enableaudioalerts", bEnableAudioAlerts );
+
// name
PutIniSetting ( IniXMLDocument, "client", "name_base64", ToBase64 ( pClient->ChannelInfo.strName ) );
diff --git a/src/settings.h b/src/settings.h
index 744c92380d..6ab7540eaa 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -130,6 +130,7 @@ class CClientSettings : public CSettings
vstrDirectoryAddress ( MAX_NUM_SERVER_ADDR_ITEMS, "" ),
eDirectoryType ( AT_DEFAULT ),
bEnableFeedbackDetection ( true ),
+ bEnableAudioAlerts ( false ),
vecWindowPosSettings(), // empty array
vecWindowPosChat(), // empty array
vecWindowPosConnect(), // empty array
@@ -163,6 +164,7 @@ class CClientSettings : public CSettings
EDirectoryType eDirectoryType;
int iCustomDirectoryIndex; // index of selected custom directory server
bool bEnableFeedbackDetection;
+ bool bEnableAudioAlerts;
// window position/state settings
QByteArray vecWindowPosSettings;
diff --git a/src/util.cpp b/src/util.cpp
index 9c2591c23d..d92f8cc428 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -593,26 +593,27 @@ CAboutDlg::CAboutDlg ( QWidget* parent ) : CBaseDlg ( parent )
"" );
// libraries used by this compilation
- txvLibraries->setText ( tr ( "This app uses the following libraries, resources or code snippets:" ) + "
" +
- tr ( "Qt cross-platform application framework" ) +
- ", https://www.qt.io
"
- "Opus Interactive Audio Codec"
- ", https://www.opus-codec.org
"
+ txvLibraries->setText (
+ tr ( "This app uses the following libraries, resources or code snippets:" ) + "
" + tr ( "Qt cross-platform application framework" ) +
+ ", 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
"
+ "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, "
- "The Synthesis ToolKit in C++ (STK)
"
- "" +
- tr ( "Some pixmaps are from the" ) +
- " Open Clip Art Library (OCAL), "
- "https://openclipart.org
"
- "" +
- tr ( "Flag icons by Mark James" ) + ", http://www.famfamfam.com
" );
+ "" +
+ tr ( "Audio reverberation code by Perry R. Cook and Gary P. Scavone" ) +
+ ", 1995 - 2021, "
+ "The Synthesis ToolKit in C++ (STK)
"
+ "" +
+ tr ( "Some pixmaps are from the" ) +
+ " Open Clip Art Library (OCAL), "
+ "https://openclipart.org
"
+ "" +
+ tr ( "Flag icons by Mark James" ) + ", http://www.famfamfam.com
" + "" +
+ tr ( "Some sound samples are from" ) + " Freesound, " + "https://freesound.org
" );
// contributors list
txvContributors->setText (
@@ -1613,6 +1614,9 @@ QString GetVersionAndNameStr ( const bool bDisplayInGui )
strVersionText += "\n *** Flag icons by Mark James";
strVersionText += "\n *** ";
strVersionText += "\n *** ";
+ strVersionText += "\n *** Some sound samples are from Freesound";
+ strVersionText += "\n *** ";
+ strVersionText += "\n *** ";
strVersionText += "\n *** Copyright (C) 2005-2022 The Jamulus Development Team";
strVersionText += "\n";
}