Fix warnings in qtmultimedia
/camerabinresourcepolicy.cpp💯42: error: unused variable 'oldSet' [-Werror=unused-variable] camerabincontrol.cpp:167:54: error: 'resourceSet' may be used uninitialized in this function [-Werror=maybe-uninitialized] qaudiooutput_pulse.cpp:416:20: error: unused variable 'bytesWritten' [-Werror=unused-variable] Change-Id: Idafd85b7985673f1f22d868b5f1b1e46a60ada4a Reviewed-by: Christian Stromme <christian.stromme@digia.com>
This commit is contained in:
committed by
The Qt Project
parent
8960e47c24
commit
7a4ea30350
@@ -149,7 +149,7 @@ void CameraBinControl::setState(QCamera::State state)
|
||||
return;
|
||||
}
|
||||
|
||||
CamerabinResourcePolicy::ResourceSet resourceSet;
|
||||
CamerabinResourcePolicy::ResourceSet resourceSet = CamerabinResourcePolicy::NoResources;
|
||||
switch (state) {
|
||||
case QCamera::UnloadedState:
|
||||
resourceSet = CamerabinResourcePolicy::NoResources;
|
||||
|
||||
@@ -162,6 +162,8 @@ void CamerabinResourcePolicy::setResourceSet(CamerabinResourcePolicy::ResourceSe
|
||||
m_resource->release();
|
||||
}
|
||||
}
|
||||
#else
|
||||
Q_UNUSED(oldSet);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
@@ -415,6 +415,7 @@ void QPulseAudioOutput::userFeed()
|
||||
}
|
||||
qint64 bytesWritten = write(m_audioBuffer, audioBytesPulled);
|
||||
Q_ASSERT(bytesWritten == audioBytesPulled); //unfinished write should not happen since the data provided is less than writableSize
|
||||
Q_UNUSED(bytesWritten);
|
||||
|
||||
if (chunks > 1) {
|
||||
// PulseAudio needs more data. Ask for it immediately.
|
||||
|
||||
Reference in New Issue
Block a user