slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix some static analysis defects.

Browse Source 
A few silly errors, a few unlikely errors, a few changes that should
not have resulted in a problem but makes the code clearer.

Change-Id: Id2c82e9317d53822e4da13c94dec9595ea33b07a
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
This commit is contained in:
Michael Goddard
2012-01-25 11:44:55 +10:00
committed by Qt by Nokia
parent 45659bd903
commit a9d78fbec9
6 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/multimedia/audio/qaudiodeviceinfo.cpp
View File

@@ -62,7 +62,12 @@ namespace
class QAudioDeviceInfoPrivate : public QSharedData
{
public:
QAudioDeviceInfoPrivate():info(0) {}
QAudioDeviceInfoPrivate()
: info(0),
mode(QAudio::AudioOutput)
{
}
QAudioDeviceInfoPrivate(const QString &r, const QByteArray &h, QAudio::Mode m):
realm(r), handle(h), mode(m)
{

1
src/multimedia/playback/qmediaplayer.cpp
View File

@@ -110,6 +110,7 @@ public:
, error(QMediaPlayer::NoError)
, filterStates(false)
, playlist(0)
, networkAccessControl(0)
{}
QMediaServiceProvider *provider;

1
src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp
View File

@@ -204,7 +204,6 @@ GstElement *QGstreamerCaptureSession::buildAudioSrc()
if (m_audioInputFactory)
audioSrc = m_audioInputFactory->buildElement();
else {
audioSrc = gst_element_factory_make("pulsesrc", "audio_src");
QString elementName = "alsasrc";
QString device;

6
src/plugins/gstreamer/mediaplayer/qgstappsrc.cpp
View File

@@ -56,6 +56,9 @@ QGstAppSrc::QGstAppSrc(QObject *parent)
,m_enoughData(false)
,m_forceData(false)
{
m_callbacks.need_data = &QGstAppSrc::on_need_data;
m_callbacks.enough_data = &QGstAppSrc::on_enough_data;
m_callbacks.seek_data = &QGstAppSrc::on_seek_data;
}
QGstAppSrc::~QGstAppSrc()
@@ -70,9 +73,6 @@ bool QGstAppSrc::setup(GstElement* appsrc)
return false;
m_appSrc = GST_APP_SRC(appsrc);
m_callbacks.need_data = &QGstAppSrc::on_need_data;
m_callbacks.enough_data = &QGstAppSrc::on_enough_data;
m_callbacks.seek_data = &QGstAppSrc::on_seek_data;
gst_app_src_set_callbacks(m_appSrc, (GstAppSrcCallbacks*)&m_callbacks, this, (GDestroyNotify)&QGstAppSrc::destroy_notify);
g_object_get(G_OBJECT(m_appSrc), "max-bytes", &m_maxBytes, NULL);

14
src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp
View File

@@ -349,13 +349,13 @@ int QGstreamerPlayerSession::activeStream(QMediaStreamsControl::StreamType strea
if (m_playbin) {
switch (streamType) {
case QMediaStreamsControl::AudioStream:
g_object_get(G_OBJECT(m_playbin), "current-audio", streamNumber, NULL);
g_object_get(G_OBJECT(m_playbin), "current-audio", &streamNumber, NULL);
break;
case QMediaStreamsControl::VideoStream:
g_object_get(G_OBJECT(m_playbin), "current-video", streamNumber, NULL);
g_object_get(G_OBJECT(m_playbin), "current-video", &streamNumber, NULL);
break;
case QMediaStreamsControl::SubPictureStream:
g_object_get(G_OBJECT(m_playbin), "current-text", streamNumber, NULL);
g_object_get(G_OBJECT(m_playbin), "current-text", &streamNumber, NULL);
break;
default:
break;
@@ -380,13 +380,13 @@ void QGstreamerPlayerSession::setActiveStream(QMediaStreamsControl::StreamType s
if (m_playbin) {
switch (streamType) {
case QMediaStreamsControl::AudioStream:
g_object_set(G_OBJECT(m_playbin), "current-audio", &streamNumber, NULL);
g_object_set(G_OBJECT(m_playbin), "current-audio", streamNumber, NULL);
break;
case QMediaStreamsControl::VideoStream:
g_object_set(G_OBJECT(m_playbin), "current-video", &streamNumber, NULL);
g_object_set(G_OBJECT(m_playbin), "current-video", streamNumber, NULL);
break;
case QMediaStreamsControl::SubPictureStream:
g_object_set(G_OBJECT(m_playbin), "current-text", &streamNumber, NULL);
g_object_set(G_OBJECT(m_playbin), "current-text", streamNumber, NULL);
break;
default:
break;
@@ -1297,6 +1297,8 @@ void QGstreamerPlayerSession::getStreamsInfo()
qDebug() << "Encountered unknown stream type";
#endif
gst_caps_unref(caps);
streamType = QMediaStreamsControl::UnknownStream;
break;
}
default:
streamType = QMediaStreamsControl::UnknownStream;

3
src/plugins/pulseaudio/qpulseaudioengine.cpp
View File

@@ -183,6 +183,9 @@ Q_GLOBAL_STATIC(QPulseAudioEngine, pulseEngine);
QPulseAudioEngine::QPulseAudioEngine(QObject *parent)
: QObject(parent)
, m_mainLoopApi(0)
, m_context(0)
{
bool keepGoing = true;
bool ok = true;