diff options
author | Michael Goddard <michael.goddard@nokia.com> | 2012-01-25 11:44:55 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-25 06:14:56 +0100 |
commit | a9d78fbec94c80241c1f90f660cf27dc259a0df4 (patch) | |
tree | 462015a61e028598be2b828038dc3b04dc25e632 /src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp | |
parent | 45659bd9031f99bf20ce2361a9a32d5805e7946c (diff) |
Fix some static analysis defects.
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>
Diffstat (limited to 'src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp')
-rw-r--r-- | src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp index 7a5518159..62ade3d07 100644 --- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp +++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp @@ -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; |