diff options
Diffstat (limited to 'src/plugins/gstreamer')
12 files changed, 67 insertions, 50 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabinservice.cpp b/src/plugins/gstreamer/camerabin/camerabinservice.cpp index e230d40f9..a401452ff 100644 --- a/src/plugins/gstreamer/camerabin/camerabinservice.cpp +++ b/src/plugins/gstreamer/camerabin/camerabinservice.cpp @@ -61,16 +61,18 @@ #include "qgstreameraudioinputendpointselector.h" #include "qgstreamervideoinputdevicecontrol.h" +#if defined(HAVE_WIDGETS) #include "qgstreamervideooverlay.h" #include "qgstreamervideowindow.h" +#include "qgstreamervideowidget.h" +#endif + #include "qgstreamervideorenderer.h" #if defined(Q_WS_MAEMO_6) && defined(__arm__) #include "qgstreamergltexturerenderer.h" #endif -#include "qgstreamervideowidget.h" - #include <qmediaserviceprovider.h> #include <QtCore/qdebug.h> @@ -92,9 +94,11 @@ CameraBinService::CameraBinService(const QString &service, QObject *parent): m_videoOutput = 0; m_videoRenderer = 0; +#if defined(HAVE_XVIDEO) && defined(HAVE_WIDGETS) m_videoWindow = 0; m_videoWidgetControl = 0; - m_imageCaptureControl = 0; +#endif + m_imageCaptureControl = 0; if (service == Q_MEDIASERVICE_CAMERA) { m_captureSession = new CameraBinSession(this); @@ -106,29 +110,24 @@ CameraBinService::CameraBinService(const QString &service, QObject *parent): m_captureSession, SLOT(setDevice(QString))); if (m_videoInputDevice->deviceCount()) - m_captureSession->setDevice(m_videoInputDevice->deviceName(m_videoInputDevice->selectedDevice())); + m_captureSession->setDevice(m_videoInputDevice->deviceName(m_videoInputDevice->selectedDevice())); -#if defined(Q_WS_MAEMO_6) && defined(__arm__) +#if defined(Q_WS_MAEMO_6) && defined(__arm__) && defined(HAVE_WIDGETS) m_videoRenderer = new QGstreamerGLTextureRenderer(this); #else m_videoRenderer = new QGstreamerVideoRenderer(this); #endif -#ifdef HAVE_XVIDEO - +#if defined(HAVE_XVIDEO) && defined(HAVE_WIDGETS) #ifdef Q_WS_MAEMO_6 m_videoWindow = new QGstreamerVideoWindow(this, "omapxvsink"); - //m_videoWindow = new QGstreamerVideoWindow(this); #else m_videoWindow = new QGstreamerVideoOverlay(this); #endif - m_videoWidgetControl = new QGstreamerVideoWidgetControl(this); - #endif } - if (!m_captureSession) { qWarning() << Q_FUNC_INFO << "Service type is not supported:" << service; return; @@ -163,11 +162,14 @@ QMediaControl *CameraBinService::requestControl(const char *name) if (!m_videoOutput) { if (qstrcmp(name, QVideoRendererControl_iid) == 0) { m_videoOutput = m_videoRenderer; - } else if (qstrcmp(name, QVideoWindowControl_iid) == 0) { + } +#if defined(HAVE_XVIDEO) && defined(HAVE_WIDGETS) + else if (qstrcmp(name, QVideoWindowControl_iid) == 0) { m_videoOutput = m_videoWindow; } else if (qstrcmp(name, QVideoWidgetControl_iid) == 0) { m_videoOutput = m_videoWidgetControl; } +#endif if (m_videoOutput) { m_captureSession->setViewfinder(m_videoOutput); diff --git a/src/plugins/gstreamer/camerabin/camerabinservice.h b/src/plugins/gstreamer/camerabin/camerabinservice.h index 5513dd80e..dd8ceba87 100644 --- a/src/plugins/gstreamer/camerabin/camerabinservice.h +++ b/src/plugins/gstreamer/camerabin/camerabinservice.h @@ -79,7 +79,7 @@ private: void setAudioPreview(GstElement*); CameraBinSession *m_captureSession; - CameraBinControl *m_cameraControl; + CameraBinControl *m_cameraControl; CameraBinMetaData *m_metaDataControl; QAudioEndpointSelector *m_audioInputEndpointSelector; @@ -88,8 +88,10 @@ private: QMediaControl *m_videoOutput; QMediaControl *m_videoRenderer; +#if defined(HAVE_XVIDEO) && defined(HAVE_WIDGETS) QMediaControl *m_videoWindow; QGstreamerVideoWidgetControl *m_videoWidgetControl; +#endif CameraBinImageCapture *m_imageCaptureControl; }; diff --git a/src/plugins/gstreamer/gstreamer.pro b/src/plugins/gstreamer/gstreamer.pro index 2cc0a0ee8..137b61c55 100644 --- a/src/plugins/gstreamer/gstreamer.pro +++ b/src/plugins/gstreamer/gstreamer.pro @@ -2,7 +2,14 @@ load(qt_module) TARGET = qgstengine -QT += multimedia-private network multimediawidgets-private +QT += multimedia-private network +CONFIG += no_private_qt_headers_warning + +contains(config_test_widgets, yes) { + QT += widgets multimediawidgets-private + DEFINES += HAVE_WIDGETS +} + PLUGIN_TYPE=mediaservice load(qt_plugin) @@ -11,9 +18,8 @@ DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE} LIBS += -lqgsttools_p unix:!maemo*:contains(QT_CONFIG, alsa) { -DEFINES += HAVE_ALSA -LIBS += \ - -lasound + DEFINES += HAVE_ALSA + LIBS += -lasound } CONFIG += link_pkgconfig @@ -40,7 +46,7 @@ maemo6 { PKGCONFIG += qmsystem2 - isEqual(QT_ARCH,armv6) { + isEqual(QT_ARCH,armv6):contains(config_test_widgets, yes) { HEADERS += qgstreamergltexturerenderer.h SOURCES += qgstreamergltexturerenderer.cpp QT += opengl @@ -68,7 +74,7 @@ SOURCES += \ gstvideoconnector.c \ -contains(config_test_xvideo, yes) { +contains(config_test_xvideo, yes):contains(config_test_widgets, yes): { DEFINES += HAVE_XVIDEO LIBS += -lXv -lX11 -lXext diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp b/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp index f1516885a..55357d21a 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp +++ b/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp @@ -55,10 +55,12 @@ #include "qgstreamervideoinputdevicecontrol.h" #include "qgstreamerimagecapturecontrol.h" -#include "qgstreamervideooverlay.h" #include "qgstreamervideorenderer.h" +#if defined(HAVE_WIDGETS) +#include "qgstreamervideooverlay.h" #include "qgstreamervideowidget.h" +#endif #include <qmediaserviceprovider.h> @@ -77,8 +79,10 @@ QGstreamerCaptureService::QGstreamerCaptureService(const QString &service, QObje m_videoOutput = 0; m_videoRenderer = 0; +#if defined(HAVE_XVIDEO) && defined(HAVE_WIDGETS) m_videoWindow = 0; m_videoWidgetControl = 0; +#endif m_imageCaptureControl = 0; if (service == Q_MEDIASERVICE_AUDIOSOURCE) { @@ -100,10 +104,10 @@ QGstreamerCaptureService::QGstreamerCaptureService(const QString &service, QObje m_videoRenderer = new QGstreamerVideoRenderer(this); -#ifdef HAVE_XVIDEO +#if defined(HAVE_XVIDEO) && defined(HAVE_WIDGETS) m_videoWindow = new QGstreamerVideoOverlay(this); m_videoWidgetControl = new QGstreamerVideoWidgetControl(this); -#endif +#endif m_imageCaptureControl = new QGstreamerImageCaptureControl(m_captureSession); } @@ -125,8 +129,8 @@ QGstreamerCaptureService::~QGstreamerCaptureService() QMediaControl *QGstreamerCaptureService::requestControl(const char *name) { if (!m_captureSession) - return 0; - + return 0; + if (qstrcmp(name,QAudioEndpointSelector_iid) == 0) return m_audioInputEndpointSelector; @@ -157,15 +161,18 @@ QMediaControl *QGstreamerCaptureService::requestControl(const char *name) if (qstrcmp(name, QCameraImageCaptureControl_iid) == 0) return m_imageCaptureControl; - + if (!m_videoOutput) { if (qstrcmp(name, QVideoRendererControl_iid) == 0) { m_videoOutput = m_videoRenderer; - } else if (qstrcmp(name, QVideoWindowControl_iid) == 0) { + } +#if defined(HAVE_WIDGETS) && defined(HAVE_XVIDEO) + else if (qstrcmp(name, QVideoWindowControl_iid) == 0) { m_videoOutput = m_videoWindow; } else if (qstrcmp(name, QVideoWidgetControl_iid) == 0) { m_videoOutput = m_videoWidgetControl; } +#endif if (m_videoOutput) { m_captureSession->setVideoPreview(m_videoOutput); diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.h b/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.h index ab01faace..5fd129d70 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.h +++ b/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.h @@ -87,8 +87,10 @@ private: QMediaControl *m_videoOutput; QGstreamerVideoRenderer *m_videoRenderer; +#if defined(HAVE_XVIDEO) && defined(HAVE_WIDGETS) QMediaControl *m_videoWindow; QMediaControl *m_videoWidgetControl; +#endif QGstreamerImageCaptureControl *m_imageCaptureControl; }; diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.cpp index c5c860778..6d65b4c57 100644 --- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.cpp +++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.cpp @@ -41,22 +41,28 @@ #include <QtCore/qvariant.h> #include <QtCore/qdebug.h> + +#if defined(HAVE_WIDGETS) #include <QtWidgets/qwidget.h> +#endif #include "qgstreamerplayerservice.h" #include "qgstreamerplayercontrol.h" #include "qgstreamerplayersession.h" #include "qgstreamermetadataprovider.h" +#if defined(HAVE_WIDGETS) #include "qgstreamervideooverlay.h" #include "qgstreamervideowindow.h" +#include "qgstreamervideowidget.h" +#endif + #include "qgstreamervideorenderer.h" #if defined(Q_WS_MAEMO_6) && defined(__arm__) #include "qgstreamergltexturerenderer.h" #endif -#include "qgstreamervideowidget.h" #include "qgstreamerstreamscontrol.h" #include <qmediaplaylistnavigator.h> @@ -65,11 +71,13 @@ QT_BEGIN_NAMESPACE QGstreamerPlayerService::QGstreamerPlayerService(QObject *parent): - QMediaService(parent), - m_videoOutput(0), - m_videoRenderer(0), - m_videoWindow(0), - m_videoWidget(0) + QMediaService(parent) + , m_videoOutput(0) + , m_videoRenderer(0) +#if defined(HAVE_XVIDEO) && defined(HAVE_WIDGETS) + , m_videoWindow(0) + , m_videoWidget(0) +#endif { m_session = new QGstreamerPlayerSession(this); m_control = new QGstreamerPlayerControl(m_session, this); @@ -82,14 +90,12 @@ QGstreamerPlayerService::QGstreamerPlayerService(QObject *parent): m_videoRenderer = new QGstreamerVideoRenderer(this); #endif -#ifdef HAVE_XVIDEO - +#if defined(HAVE_XVIDEO) && defined(HAVE_WIDGETS) #ifdef Q_WS_MAEMO_6 m_videoWindow = new QGstreamerVideoWindow(this, "omapxvsink"); #else m_videoWindow = new QGstreamerVideoOverlay(this); #endif - m_videoWidget = new QGstreamerVideoWidgetControl(this); #endif } @@ -110,12 +116,14 @@ QMediaControl *QGstreamerPlayerService::requestControl(const char *name) return m_streamsControl; if (!m_videoOutput) { - if (qstrcmp(name, QVideoWidgetControl_iid) == 0) - m_videoOutput = m_videoWidget; - else if (qstrcmp(name, QVideoRendererControl_iid) == 0) + if (qstrcmp(name, QVideoRendererControl_iid) == 0) m_videoOutput = m_videoRenderer; +#if defined(HAVE_XVIDEO) && defined(HAVE_WIDGETS) + else if (qstrcmp(name, QVideoWidgetControl_iid) == 0) + m_videoOutput = m_videoWidget; else if (qstrcmp(name, QVideoWindowControl_iid) == 0) m_videoOutput = m_videoWindow; +#endif if (m_videoOutput) { m_control->setVideoOutput(m_videoOutput); diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.h b/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.h index 7418406d6..1cc8d4183 100644 --- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.h +++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.h @@ -80,8 +80,10 @@ private: QMediaControl *m_videoOutput; QMediaControl *m_videoRenderer; +#if defined(HAVE_XVIDEO) && defined(HAVE_WIDGETS) QMediaControl *m_videoWindow; QMediaControl *m_videoWidget; +#endif }; QT_END_NAMESPACE diff --git a/src/plugins/gstreamer/qgstreameraudioinputendpointselector.cpp b/src/plugins/gstreamer/qgstreameraudioinputendpointselector.cpp index 9433850bd..a89694362 100644 --- a/src/plugins/gstreamer/qgstreameraudioinputendpointselector.cpp +++ b/src/plugins/gstreamer/qgstreameraudioinputendpointselector.cpp @@ -41,7 +41,6 @@ #include "qgstreameraudioinputendpointselector.h" -#include <QtWidgets/QIcon> #include <QtCore/QDir> #include <QtCore/QDebug> diff --git a/src/plugins/gstreamer/qgstreamerserviceplugin.cpp b/src/plugins/gstreamer/qgstreamerserviceplugin.cpp index 64d71c550..bb77ce1b6 100644 --- a/src/plugins/gstreamer/qgstreamerserviceplugin.cpp +++ b/src/plugins/gstreamer/qgstreamerserviceplugin.cpp @@ -41,7 +41,6 @@ #include <QtCore/qstring.h> #include <QtCore/qdebug.h> -#include <QtWidgets/QIcon> #include <QtCore/QDir> #include <QtCore/QDebug> diff --git a/src/plugins/gstreamer/qgstreamervideoinputdevicecontrol.cpp b/src/plugins/gstreamer/qgstreamervideoinputdevicecontrol.cpp index ec9e9baf4..3e92efd28 100644 --- a/src/plugins/gstreamer/qgstreamervideoinputdevicecontrol.cpp +++ b/src/plugins/gstreamer/qgstreamervideoinputdevicecontrol.cpp @@ -41,7 +41,6 @@ #include "qgstreamervideoinputdevicecontrol.h" -#include <QtWidgets/QIcon> #include <QtCore/QDir> #include <QtCore/QDebug> @@ -82,12 +81,6 @@ QString QGstreamerVideoInputDeviceControl::deviceDescription(int index) const return m_descriptions[index]; } -QIcon QGstreamerVideoInputDeviceControl::deviceIcon(int index) const -{ - Q_UNUSED(index); - return QIcon(); -} - int QGstreamerVideoInputDeviceControl::defaultDevice() const { return 0; diff --git a/src/plugins/gstreamer/qgstreamervideoinputdevicecontrol.h b/src/plugins/gstreamer/qgstreamervideoinputdevicecontrol.h index feb24f07f..5c19a966a 100644 --- a/src/plugins/gstreamer/qgstreamervideoinputdevicecontrol.h +++ b/src/plugins/gstreamer/qgstreamervideoinputdevicecontrol.h @@ -58,7 +58,6 @@ public: QString deviceName(int index) const; QString deviceDescription(int index) const; - QIcon deviceIcon(int index) const; int defaultDevice() const; int selectedDevice() const; diff --git a/src/plugins/gstreamer/qgstreamervideorenderer.cpp b/src/plugins/gstreamer/qgstreamervideorenderer.cpp index ac3d4a192..529211ce8 100644 --- a/src/plugins/gstreamer/qgstreamervideorenderer.cpp +++ b/src/plugins/gstreamer/qgstreamervideorenderer.cpp @@ -43,8 +43,6 @@ #include <private/qvideosurfacegstsink_p.h> #include <qabstractvideosurface.h> -#include <QEvent> -#include <QtWidgets/QApplication> #include <QDebug> #include <gst/gst.h> |