1
0
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:
sudden6 2017-12-20 00:15:45 +01:00
commit f22def5a19
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
4 changed files with 12 additions and 24 deletions

View File

@ -48,18 +48,6 @@ static const uint32_t AUDIO_CHANNELS = 2;
OpenAL::OpenAL() OpenAL::OpenAL()
: audioThread{new QThread} : 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 // initialize OpenAL error stack
alGetError(); alGetError();

View File

@ -116,19 +116,19 @@ protected:
QThread* audioThread; QThread* audioThread;
mutable QMutex audioLock; mutable QMutex audioLock;
ALCdevice* alInDev; ALCdevice* alInDev = nullptr;
quint32 inSubscriptions; quint32 inSubscriptions = 0;
QTimer captureTimer, playMono16Timer; QTimer captureTimer, playMono16Timer;
ALCdevice* alOutDev; ALCdevice* alOutDev = nullptr;
ALCcontext* alOutContext; ALCcontext* alOutContext = nullptr;
ALuint alMainSource; ALuint alMainSource = 0;
ALuint alMainBuffer; ALuint alMainBuffer = 0;
bool outputInitialized; bool outputInitialized = false;
QList<ALuint> peerSources; QList<ALuint> peerSources;
qreal gain; qreal gain = 0;
qreal gainFactor; qreal gainFactor = 1;
qreal minInGain = -30; qreal minInGain = -30;
qreal maxInGain = 30; qreal maxInGain = 30;
qreal inputThreshold; qreal inputThreshold;

View File

@ -31,8 +31,8 @@
static const int MAX_GROUP_TITLE_LENGTH = 128; static const int MAX_GROUP_TITLE_LENGTH = 128;
Group::Group(int groupId, const QString& name, bool isAvGroupchat, const QString& selfName) Group::Group(int groupId, const QString& name, bool isAvGroupchat, const QString& selfName)
: title{name} : selfName{selfName}
, selfName{selfName} , title{name}
, groupId(groupId) , groupId(groupId)
, nPeers{0} , nPeers{0}
, avGroupchat{isAvGroupchat} , avGroupchat{isAvGroupchat}

View File

@ -111,8 +111,8 @@ QString secondsToDHMS(quint32 duration)
ChatForm::ChatForm(Friend* chatFriend, History* history) ChatForm::ChatForm(Friend* chatFriend, History* history)
: f(chatFriend) : f(chatFriend)
, callDuration(new QLabel(this)) , callDuration(new QLabel(this))
, isTyping(false)
, history{history} , history{history}
, isTyping{false}
, lastCallIsVideo{false} , lastCallIsVideo{false}
{ {
setName(f->getDisplayedName()); setName(f->getDisplayedName());