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

Ref T730, fixed using wrong member "m_outputVolume", added new member "m_outputVolumeDb"

Browse Source
This commit is contained in:
Klaus Basan
2019-09-29 23:55:42 +02:00
committed by Mat Sutcliffe
parent 3ddded423a
commit cf6434f49b
3 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/blackcore/afv/clients/afvclient.cpp
View File

@@ -342,27 +342,30 @@ namespace BlackCore
// qDebug() << "PTT:" << active;
}
void CAfvClient::setInputVolumeDb(double value)
void CAfvClient::setInputVolumeDb(double valueDb)
{
if (value > MaxDb) { value = MaxDb; }
if (value < MinDb) { value = MinDb; }
m_inputVolumeDb = value;
m_input->setVolume(qPow(10, value / 20.0));
if (valueDb > MaxDbIn) { valueDb = MaxDbIn; }
if (valueDb < MinDbIn) { valueDb = MinDbIn; }
m_inputVolumeDb = valueDb;
if (m_input)
{
m_input->setVolume(qPow(10, valueDb / 20.0));
}
}
int CAfvClient::getNormalizedInputVolume() const
{
const double db = this->getInputVolumeDb();
const double range = MaxDb - MinDb;
const int i = qRound((db - MinDb) / range * 100);
const double range = MaxDbIn - MinDbIn;
const int i = qRound((db - MinDbIn) / range * 100);
return i;
}
int CAfvClient::getNormalizedOutputVolume() const
{
const double db = this->getOutputVolumeDb();
const double range = MaxDb - MinDb;
const int i = qRound((db - MinDb) / range * 100);
const double range = MaxDbIn - MinDbIn;
const int i = qRound((db - MinDbIn) / range * 100);
return i;
}
@@ -370,8 +373,8 @@ namespace BlackCore
{
if (volume < 0) { volume = 0; }
else if (volume > 100) { volume = 100; }
const double range = MaxDb - MinDb;
const double dB = MinDb + (volume * range / 100.0);
const double range = MaxDbIn - MinDbIn;
const double dB = MinDbIn + (volume * range / 100.0);
this->setInputVolumeDb(dB);
}
@@ -379,8 +382,8 @@ namespace BlackCore
{
if (volume < 0) { volume = 0; }
else if (volume > 100) { volume = 100; }
const double range = MaxDb - MinDb;
const double dB = MinDb + (volume * range / 100.0);
const double range = MaxDbIn - MinDbIn;
const double dB = MinDbIn + (volume * range / 100.0);
this->setOutputVolumeDb(dB);
}
@@ -532,19 +535,16 @@ namespace BlackCore
return sApp && !sApp->isShuttingDown() && sApp->getIContextOwnAircraft();
}
double CAfvClient::getOutputVolumeDb() const
void CAfvClient::setOutputVolumeDb(double valueDb)
{
return m_outputVolume;
}
if (valueDb > MaxDbOut) { valueDb = MaxDbOut; }
if (valueDb < MinDbOut) { valueDb = MinDbOut; }
m_outputVolumeDb = valueDb;
void CAfvClient::setOutputVolumeDb(double outputVolume)
{
if (outputVolume > 18) { m_outputVolume = 18; }
if (outputVolume < -60) { m_outputVolume = -60; }
m_outputVolume = qPow(10, m_outputVolume / 20);
m_outputVolume = qPow(10, m_outputVolumeDb / 20.0);
if (outputSampleProvider)
{
outputSampleProvider->setVolume(outputVolume);
outputSampleProvider->setVolume(m_outputVolume);
}
}