diff options
Diffstat (limited to 'src/plugins/gstreamer/mediaplayer')
9 files changed, 31 insertions, 11 deletions
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp index 667067234..82b7d1bd3 100644 --- a/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp +++ b/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp @@ -45,6 +45,8 @@ #include <gst/gstversion.h> +QT_BEGIN_NAMESPACE + struct QGstreamerMetaDataKeyLookup { QtMultimedia::MetaData key; @@ -190,3 +192,5 @@ void QGstreamerMetaDataProvider::updateTags() { emit metaDataChanged(); } + +QT_END_NAMESPACE diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.h b/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.h index efba79c6b..420d50e8d 100644 --- a/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.h +++ b/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.h @@ -44,7 +44,7 @@ #include <qmetadatareadercontrol.h> -QT_USE_NAMESPACE +QT_BEGIN_NAMESPACE class QGstreamerPlayerSession; @@ -71,4 +71,6 @@ private: QGstreamerPlayerSession *m_session; }; +QT_END_NAMESPACE + #endif // QGSTREAMERMETADATAPROVIDER_H diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp index 619816313..541d7f261 100644 --- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp +++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp @@ -58,6 +58,8 @@ //#define DEBUG_PLAYBIN +QT_BEGIN_NAMESPACE + QGstreamerPlayerControl::QGstreamerPlayerControl(QGstreamerPlayerSession *session, QObject *parent) : QMediaPlayerControl(parent) , m_ownStream(false) @@ -773,3 +775,5 @@ void QGstreamerPlayerControl::updatePosition(qint64 pos) emit positionChanged(pos); } + +QT_END_NAMESPACE diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.h b/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.h index ea02c9766..0fc60f27b 100644 --- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.h +++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.h @@ -50,17 +50,15 @@ #include <limits.h> +class PlayerResourcePolicy; + QT_BEGIN_NAMESPACE class QMediaPlaylist; class QMediaPlaylistNavigator; class QSocketNotifier; -QT_END_NAMESPACE - -QT_USE_NAMESPACE class QGstreamerPlayerSession; class QGstreamerPlayerService; -class PlayerResourcePolicy; class QGstreamerPlayerControl : public QMediaPlayerControl { @@ -155,4 +153,6 @@ private: PlayerResourcePolicy *m_resources; }; +QT_END_NAMESPACE + #endif diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.cpp index 7c017e284..7175c4da3 100644 --- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.cpp +++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.cpp @@ -62,6 +62,8 @@ #include <qmediaplaylistnavigator.h> #include <qmediaplaylist.h> +QT_BEGIN_NAMESPACE + QGstreamerPlayerService::QGstreamerPlayerService(QObject *parent): QMediaService(parent), m_videoOutput(0), @@ -132,3 +134,4 @@ void QGstreamerPlayerService::releaseControl(QMediaControl *control) } } +QT_END_NAMESPACE diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.h b/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.h index ffaae1713..7418406d6 100644 --- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.h +++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.h @@ -52,7 +52,6 @@ class QMediaMetaData; class QMediaPlayerControl; class QMediaPlaylist; class QMediaPlaylistNavigator; -QT_END_NAMESPACE class QGstreamerMetaData; class QGstreamerPlayerControl; @@ -63,8 +62,6 @@ class QGstreamerVideoRenderer; class QGstreamerVideoOverlay; class QGstreamerVideoWidgetControl; -QT_USE_NAMESPACE - class QGstreamerPlayerService : public QMediaService { Q_OBJECT @@ -87,4 +84,6 @@ private: QMediaControl *m_videoWidget; }; +QT_END_NAMESPACE + #endif diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp index db64ba66a..7b6f39832 100644 --- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp +++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp @@ -64,6 +64,8 @@ //#define DEBUG_PLAYBIN //#define DEBUG_VO_BIN_DUMP +QT_BEGIN_NAMESPACE + typedef enum { GST_PLAY_FLAG_VIDEO = 0x00000001, GST_PLAY_FLAG_AUDIO = 0x00000002, @@ -1616,3 +1618,5 @@ void QGstreamerPlayerSession::showPrerollFrames(bool enabled) m_displayPrerolledFrame = enabled; } } + +QT_END_NAMESPACE diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.h b/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.h index 3380e6e7b..11f2740f5 100644 --- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.h +++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.h @@ -55,13 +55,13 @@ #include <gst/gst.h> +QT_BEGIN_NAMESPACE + class QGstreamerBusHelper; class QGstreamerMessage; class QGstreamerVideoRendererInterface; -QT_USE_NAMESPACE - class QGstreamerPlayerSession : public QObject, public QGstreamerBusMessageFilter { @@ -226,4 +226,6 @@ private: bool m_isLiveSource; }; +QT_END_NAMESPACE + #endif // QGSTREAMERPLAYERSESSION_H diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerstreamscontrol.h b/src/plugins/gstreamer/mediaplayer/qgstreamerstreamscontrol.h index 77f0f2d93..686404a9a 100644 --- a/src/plugins/gstreamer/mediaplayer/qgstreamerstreamscontrol.h +++ b/src/plugins/gstreamer/mediaplayer/qgstreamerstreamscontrol.h @@ -44,7 +44,7 @@ #include <qmediastreamscontrol.h> -QT_USE_NAMESPACE +QT_BEGIN_NAMESPACE class QGstreamerPlayerSession; @@ -67,5 +67,7 @@ private: QGstreamerPlayerSession *m_session; }; +QT_END_NAMESPACE + #endif // QGSTREAMERSTREAMSCONTROL_H |