flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-31 04:25:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Issue #100 Seperate COM1/2 output volumes

Browse Source
This commit is contained in:
Lars Toenning
2021-09-03 00:54:40 +02:00
committed by Mat Sutcliffe
parent 577431ae49
commit c1b75f7532
24 changed files with 270 additions and 509 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/blackmisc/audio/audiosettings.cpp
View File

@@ -92,9 +92,14 @@ namespace BlackMisc
else if (m_notificationVolume > 100) { m_notificationVolume = 100; }
}
void CSettings::setOutVolume(int volume)
void CSettings::setOutVolumeCom1(int volume)
{
m_outVolume = fixOutVolume(volume);
m_outVolumeCom1 = fixOutVolume(volume);
}
void CSettings::setOutVolumeCom2(int volume)
{
m_outVolumeCom2 = fixOutVolume(volume);
}
void CSettings::setInVolume(int volume)

20
src/blackmisc/audio/audiosettings.h
View File

@@ -95,11 +95,17 @@ namespace BlackMisc
//! Get volume (notifications)
int getNotificationVolume() const { return m_notificationVolume; }
//! Set volume (audio) 0..100
void setOutVolume(int volume);
//! Set volume for com1 (audio) 0..100
void setOutVolumeCom1(int volume);
//! Get volume (audio) 0..100
int getOutVolume() const { return m_outVolume; }
//! Get volume for com1 (audio) 0..100
int getOutVolumeCom1() const { return m_outVolumeCom1; }
//! Set volume for com2 (audio) 0..100
void setOutVolumeCom2(int volume);
//! Get volume for com2 (audio) 0..100
int getOutVolumeCom2() const { return m_outVolumeCom2; }
//! Set mic.volume 0..100
void setInVolume(int volume);
@@ -123,7 +129,8 @@ namespace BlackMisc
QString m_notificationSoundDir;
int m_notification = static_cast<int>(CNotificationSounds::DefaultNotifications); //!< play notification for notification x, a little trick to use a string here (streamable, hashable, ..)
int m_notificationVolume = 90; //!< 0-90
int m_outVolume = 50; //!< 0-100, AFV
int m_outVolumeCom1 = 50; //!< 0-100, AFV
int m_outVolumeCom2 = 50; //!< 0-100, AFV
int m_inVolume = 50; //!< AFV range
bool m_audioEffects = true; //!< Audio effects en
void initNotificationFlags(); //!< init flags
@@ -133,7 +140,8 @@ namespace BlackMisc
BLACK_METAMEMBER(notificationSoundDir),
BLACK_METAMEMBER(notification),
BLACK_METAMEMBER(notificationVolume),
BLACK_METAMEMBER(outVolume),
BLACK_METAMEMBER(outVolumeCom1),
BLACK_METAMEMBER(outVolumeCom2),
BLACK_METAMEMBER(inVolume),
BLACK_METAMEMBER(audioEffects)
);

1
src/blackmisc/blackmisc.qrc
View File

@@ -119,6 +119,7 @@
<file>icons/pastel/16/folder-green.png</file>
<file>icons/pastel/16/folder-pink.png</file>
<file>icons/pastel/16/folder-purple.png</file>
<file>icons/pastel/16/undo.png</file>
</qresource>
<qresource prefix="/vatsim">
<file>icons/vatsim/C1.png</file>