Browse Source

fix: elimination of warning '-Wreorder'

reviewable/pr4867/r1
Pavel Karelin 8 years ago
parent
commit
0869d3d8fd
  1. 12
      src/audio/backend/openal.cpp
  2. 18
      src/audio/backend/openal.h
  3. 4
      src/model/group.cpp
  4. 2
      src/widget/form/chatform.cpp

12
src/audio/backend/openal.cpp

@ -48,18 +48,6 @@ static const uint32_t AUDIO_CHANNELS = 2; @@ -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();

18
src/audio/backend/openal.h

@ -116,19 +116,19 @@ protected: @@ -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;

4
src/model/group.cpp

@ -31,8 +31,8 @@ @@ -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}

2
src/widget/form/chatform.cpp

@ -111,8 +111,8 @@ QString secondsToDHMS(quint32 duration) @@ -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…
Cancel
Save