diff options
Diffstat (limited to 'src/plugins/gstreamer/mediacapture')
13 files changed, 47 insertions, 16 deletions
diff --git a/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.h b/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.h index 117aa6dc0..e6db79c95 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.h +++ b/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.h @@ -43,7 +43,6 @@ #define QGSTREAMERAUDIOENCODE_H #include <qaudioencodercontrol.h> -class QGstreamerCaptureSession; #include <QtCore/qstringlist.h> #include <QtCore/qmap.h> @@ -53,7 +52,9 @@ class QGstreamerCaptureSession; #include <qaudioformat.h> -QT_USE_NAMESPACE +QT_BEGIN_NAMESPACE + +class QGstreamerCaptureSession; class QGstreamerAudioEncode : public QAudioEncoderControl { @@ -94,4 +95,6 @@ private: QAudioEncoderSettings m_audioSettings; }; +QT_END_NAMESPACE + #endif diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercameracontrol.h b/src/plugins/gstreamer/mediacapture/qgstreamercameracontrol.h index 6e8fb0e6d..fdc9c8293 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamercameracontrol.h +++ b/src/plugins/gstreamer/mediacapture/qgstreamercameracontrol.h @@ -47,8 +47,7 @@ #include <qcameracontrol.h> #include "qgstreamercapturesession.h" -QT_USE_NAMESPACE -QT_USE_NAMESPACE +QT_BEGIN_NAMESPACE class QGstreamerCameraControl : public QCameraControl { @@ -95,4 +94,6 @@ private: bool m_reloadPending; }; +QT_END_NAMESPACE + #endif // QGSTREAMERCAMERACONTROL_H diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.h b/src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.h index 031f630d5..9dd16ac79 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.h +++ b/src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.h @@ -44,7 +44,7 @@ #include <qmetadatawritercontrol.h> -QT_USE_NAMESPACE +QT_BEGIN_NAMESPACE class QGstreamerCaptureMetaDataControl : public QMetaDataWriterControl { @@ -72,4 +72,6 @@ private: QMap<QByteArray, QVariant> m_values; }; +QT_END_NAMESPACE + #endif // QGSTREAMERCAPTUREMETADATACONTROL_H diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp b/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp index ee64b2cc1..f10fd58a7 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp +++ b/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp @@ -62,6 +62,7 @@ #include <qmediaserviceprovider.h> +QT_BEGIN_NAMESPACE QGstreamerCaptureService::QGstreamerCaptureService(const QString &service, QObject *parent): QMediaService(parent) @@ -182,3 +183,5 @@ void QGstreamerCaptureService::releaseControl(QMediaControl *control) m_captureSession->setVideoPreview(0); } } + +QT_END_NAMESPACE diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.h b/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.h index 41ba4a99c..ab01faace 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.h +++ b/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.h @@ -49,7 +49,6 @@ QT_BEGIN_NAMESPACE class QAudioEndpointSelector; class QVideoDeviceControl; -QT_END_NAMESPACE class QGstreamerCaptureSession; class QGstreamerCameraControl; @@ -93,4 +92,6 @@ private: QGstreamerImageCaptureControl *m_imageCaptureControl; }; +QT_END_NAMESPACE + #endif // QGSTREAMERCAPTURESERVICE_H diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp b/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp index 8d87bb387..68b801fa1 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp +++ b/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp @@ -61,6 +61,8 @@ #include <QtGui/qimage.h> +QT_BEGIN_NAMESPACE + #define gstRef(element) { gst_object_ref(GST_OBJECT(element)); gst_object_sink(GST_OBJECT(element)); } #define gstUnref(element) { if (element) { gst_object_unref(GST_OBJECT(element)); element = 0; } } @@ -1022,3 +1024,5 @@ void QGstreamerCaptureSession::setMuted(bool muted) emit mutedChanged(muted); } } + +QT_END_NAMESPACE diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.h b/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.h index aa5a09cdc..4fd1c3a5e 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.h +++ b/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.h @@ -51,7 +51,7 @@ #include <private/qgstreamerbushelper_p.h> -QT_USE_NAMESPACE +QT_BEGIN_NAMESPACE class QGstreamerMessage; class QGstreamerBusHelper; @@ -208,4 +208,6 @@ public: int m_imageRequestId; }; +QT_END_NAMESPACE + #endif // QGSTREAMERCAPTURESESSION_H diff --git a/src/plugins/gstreamer/mediacapture/qgstreamerimagecapturecontrol.h b/src/plugins/gstreamer/mediacapture/qgstreamerimagecapturecontrol.h index 186aa39ba..b525223e9 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamerimagecapturecontrol.h +++ b/src/plugins/gstreamer/mediacapture/qgstreamerimagecapturecontrol.h @@ -45,7 +45,8 @@ #include <qcameraimagecapturecontrol.h> #include "qgstreamercapturesession.h" -QT_USE_NAMESPACE + +QT_BEGIN_NAMESPACE class QGstreamerImageCaptureControl : public QCameraImageCaptureControl { @@ -70,4 +71,6 @@ private: int m_lastId; }; +QT_END_NAMESPACE + #endif // QGSTREAMERCAPTURECORNTROL_H diff --git a/src/plugins/gstreamer/mediacapture/qgstreamerimageencode.h b/src/plugins/gstreamer/mediacapture/qgstreamerimageencode.h index a3c62945d..ba736d5de 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamerimageencode.h +++ b/src/plugins/gstreamer/mediacapture/qgstreamerimageencode.h @@ -42,15 +42,16 @@ #ifndef QGSTREAMERIMAGEENCODE_H #define QGSTREAMERIMAGEENCODE_H -class QGstreamerCaptureSession; - #include <qimageencodercontrol.h> #include <QtCore/qstringlist.h> #include <QtCore/qmap.h> #include <gst/gst.h> -QT_USE_NAMESPACE + +QT_BEGIN_NAMESPACE + +class QGstreamerCaptureSession; class QGstreamerImageEncode : public QImageEncoderControl { @@ -77,4 +78,6 @@ private: QGstreamerCaptureSession *m_session; }; +QT_END_NAMESPACE + #endif diff --git a/src/plugins/gstreamer/mediacapture/qgstreamermediacontainercontrol.h b/src/plugins/gstreamer/mediacapture/qgstreamermediacontainercontrol.h index 345226b44..a8a40b0b1 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamermediacontainercontrol.h +++ b/src/plugins/gstreamer/mediacapture/qgstreamermediacontainercontrol.h @@ -49,7 +49,7 @@ #include <gst/gst.h> -QT_USE_NAMESPACE +QT_BEGIN_NAMESPACE class QGstreamerMediaContainerControl : public QMediaContainerControl { @@ -81,4 +81,6 @@ private: QMap<QString, QSet<QString> > m_streamTypes; }; +QT_END_NAMESPACE + #endif // QGSTREAMERMEDIACONTAINERCONTROL_H diff --git a/src/plugins/gstreamer/mediacapture/qgstreamerrecordercontrol.h b/src/plugins/gstreamer/mediacapture/qgstreamerrecordercontrol.h index 66f4ee630..bdd903d27 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamerrecordercontrol.h +++ b/src/plugins/gstreamer/mediacapture/qgstreamerrecordercontrol.h @@ -48,7 +48,7 @@ #include <qmediarecordercontrol.h> #include "qgstreamercapturesession.h" -QT_USE_NAMESPACE +QT_BEGIN_NAMESPACE class QGstreamerRecorderControl : public QMediaRecorderControl { @@ -88,4 +88,6 @@ private: bool m_hasPreviewState; }; +QT_END_NAMESPACE + #endif // QGSTREAMERCAPTURECORNTROL_H diff --git a/src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.h b/src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.h index 278f6425b..059795553 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.h +++ b/src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.h @@ -49,7 +49,7 @@ #include <QtCore/qsize.h> #include "qgstreamercapturesession.h" -QT_USE_NAMESPACE +QT_BEGIN_NAMESPACE class QGstreamerV4L2Input : public QObject, public QGstreamerVideoInput { @@ -80,4 +80,6 @@ private: QByteArray m_device; }; +QT_END_NAMESPACE + #endif // QGSTREAMERV4L2INPUT_H diff --git a/src/plugins/gstreamer/mediacapture/qgstreamervideoencode.h b/src/plugins/gstreamer/mediacapture/qgstreamervideoencode.h index f2b7a41ae..09e64a9a5 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamervideoencode.h +++ b/src/plugins/gstreamer/mediacapture/qgstreamervideoencode.h @@ -43,7 +43,6 @@ #define QGSTREAMERVIDEOENCODE_H #include <qvideoencodercontrol.h> -class QGstreamerCaptureSession; #include <QtCore/qstringlist.h> #include <QtCore/qmap.h> @@ -51,7 +50,9 @@ class QGstreamerCaptureSession; #include <gst/gst.h> -QT_USE_NAMESPACE +QT_BEGIN_NAMESPACE + +class QGstreamerCaptureSession; class QGstreamerVideoEncode : public QVideoEncoderControl { @@ -95,4 +96,6 @@ private: QMap<QString, QSet<QString> > m_streamTypes; }; +QT_END_NAMESPACE + #endif |