mirror of
https://github.com/qTox/qTox.git
synced 2024-03-22 14:00:36 +08:00
Merge pull request #4869
Pavel Karelin (1): fix: elimination of warning '-Wreorder'
This commit is contained in:
commit
f22def5a19
|
@ -48,18 +48,6 @@ static const uint32_t AUDIO_CHANNELS = 2;
|
|||
|
||||
OpenAL::OpenAL()
|
||||
: audioThread{new QThread}
|
||||
, alInDev{nullptr}
|
||||
, inSubscriptions{0}
|
||||
, alOutDev{nullptr}
|
||||
, alOutContext{nullptr}
|
||||
, alMainSource{0}
|
||||
, alMainBuffer{0}
|
||||
, outputInitialized{false}
|
||||
, minInGain{-30}
|
||||
, maxInGain{30}
|
||||
, minInThreshold{0.0f}
|
||||
, maxInThreshold{0.4f}
|
||||
, isActive{false}
|
||||
{
|
||||
// initialize OpenAL error stack
|
||||
alGetError();
|
||||
|
|
|
@ -116,19 +116,19 @@ protected:
|
|||
QThread* audioThread;
|
||||
mutable QMutex audioLock;
|
||||
|
||||
ALCdevice* alInDev;
|
||||
quint32 inSubscriptions;
|
||||
ALCdevice* alInDev = nullptr;
|
||||
quint32 inSubscriptions = 0;
|
||||
QTimer captureTimer, playMono16Timer;
|
||||
|
||||
ALCdevice* alOutDev;
|
||||
ALCcontext* alOutContext;
|
||||
ALuint alMainSource;
|
||||
ALuint alMainBuffer;
|
||||
bool outputInitialized;
|
||||
ALCdevice* alOutDev = nullptr;
|
||||
ALCcontext* alOutContext = nullptr;
|
||||
ALuint alMainSource = 0;
|
||||
ALuint alMainBuffer = 0;
|
||||
bool outputInitialized = false;
|
||||
|
||||
QList<ALuint> peerSources;
|
||||
qreal gain;
|
||||
qreal gainFactor;
|
||||
qreal gain = 0;
|
||||
qreal gainFactor = 1;
|
||||
qreal minInGain = -30;
|
||||
qreal maxInGain = 30;
|
||||
qreal inputThreshold;
|
||||
|
|
|
@ -31,8 +31,8 @@
|
|||
static const int MAX_GROUP_TITLE_LENGTH = 128;
|
||||
|
||||
Group::Group(int groupId, const QString& name, bool isAvGroupchat, const QString& selfName)
|
||||
: title{name}
|
||||
, selfName{selfName}
|
||||
: selfName{selfName}
|
||||
, title{name}
|
||||
, groupId(groupId)
|
||||
, nPeers{0}
|
||||
, avGroupchat{isAvGroupchat}
|
||||
|
|
|
@ -111,8 +111,8 @@ QString secondsToDHMS(quint32 duration)
|
|||
ChatForm::ChatForm(Friend* chatFriend, History* history)
|
||||
: f(chatFriend)
|
||||
, callDuration(new QLabel(this))
|
||||
, isTyping(false)
|
||||
, history{history}
|
||||
, isTyping{false}
|
||||
, lastCallIsVideo{false}
|
||||
{
|
||||
setName(f->getDisplayedName());
|
||||
|
|
Loading…
Reference in New Issue
Block a user