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

Ref T730, Ref T739 avoid timer stopping issue during shutdown

Browse Source 
* use timer with parent
* avoid QObject::~QObject: Timers cannot be stopped from another thread
* see https://discordapp.com/channels/539048679160676382/623947987822837779/630521007056224286
This commit is contained in:
Klaus Basan
2019-10-07 18:07:14 +02:00
committed by Mat Sutcliffe
parent b0f1f5fae4
commit 713d2ee626
4 changed files with 32 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/blacksound/sampleprovider/simplecompressoreffect.cpp
View File

@@ -17,14 +17,18 @@ namespace BlackSound
ISampleProvider(parent),
m_sourceStream(source)
{
this->setObjectName("CSimpleCompressorEffect");
m_timer = new QTimer(this);
m_timer->setObjectName(this->objectName() + ":m_timer");
m_simpleCompressor.setAttack(5.0);
m_simpleCompressor.setRelease(10.0);
m_simpleCompressor.setSampleRate(48000.0);
m_simpleCompressor.setThresh(16.0);
m_simpleCompressor.setRatio(6.0);
m_simpleCompressor.setMakeUpGain(16.0);
m_timer.start(3000);
m_timer->start(3000);
}
int CSimpleCompressorEffect::readSamples(QVector<float> &samples, qint64 count)
@@ -33,14 +37,16 @@ namespace BlackSound
if (m_enabled)
{
for (int sample = 0; sample < samplesRead; sample += channels)
for (int sample = 0; sample < samplesRead; sample += m_channels)
{
double in1 = samples.at(sample);
double in2 = (channels == 1) ? 0 : samples.at(sample + 1);
double in2 = (m_channels == 1) ? 0 : samples.at(sample + 1);
m_simpleCompressor.process(in1, in2);
samples[sample] = in1;
if (channels > 1)
samples[sample + 1] = in2;
samples[sample] = static_cast<float>(in1);
if (m_channels > 1)
{
samples[sample + 1] = static_cast<float>(in2);
}
}
}
return samplesRead;

6
src/blacksound/sampleprovider/simplecompressoreffect.h
View File

@@ -41,11 +41,11 @@ namespace BlackSound
void setMakeUpGain(double gain);
private:
QTimer m_timer;
QTimer *m_timer = nullptr;
ISampleProvider *m_sourceStream = nullptr;
bool m_enabled = true;
bool m_enabled = true;
const int m_channels = 1;
chunkware_simple::SimpleComp m_simpleCompressor;
const int channels = 1;
};
} // ns
} // ns