diff options
Diffstat (limited to 'src/plugins/gstreamer/camerabin/camerabinservice.cpp')
| -rw-r--r-- | src/plugins/gstreamer/camerabin/camerabinservice.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabinservice.cpp b/src/plugins/gstreamer/camerabin/camerabinservice.cpp index 5003699ee..54c49f41c 100644 --- a/src/plugins/gstreamer/camerabin/camerabinservice.cpp +++ b/src/plugins/gstreamer/camerabin/camerabinservice.cpp @@ -66,12 +66,11 @@ #include <private/qgstreameraudioinputselector_p.h> #include <private/qgstreamervideoinputdevicecontrol_p.h> + #if defined(HAVE_WIDGETS) -#include <private/qgstreamervideooverlay_p.h> -#include <private/qgstreamervideowindow_p.h> #include <private/qgstreamervideowidget_p.h> #endif - +#include <private/qgstreamervideowindow_p.h> #include <private/qgstreamervideorenderer_p.h> #if defined(Q_WS_MAEMO_6) && defined(__arm__) @@ -101,8 +100,8 @@ CameraBinService::CameraBinService(const QString &service, QObject *parent): m_videoOutput = 0; m_videoRenderer = 0; -#if defined(HAVE_XVIDEO) && defined(HAVE_WIDGETS) m_videoWindow = 0; +#if defined(HAVE_WIDGETS) m_videoWidgetControl = 0; #endif m_imageCaptureControl = 0; @@ -125,12 +124,13 @@ CameraBinService::CameraBinService(const QString &service, QObject *parent): m_videoRenderer = new QGstreamerVideoRenderer(this); #endif -#if defined(HAVE_XVIDEO) && defined(HAVE_WIDGETS) #ifdef Q_WS_MAEMO_6 m_videoWindow = new QGstreamerVideoWindow(this, "omapxvsink"); #else - m_videoWindow = new QGstreamerVideoOverlay(this); + m_videoWindow = new QGstreamerVideoWindow(this); #endif + +#if defined(HAVE_WIDGETS) m_videoWidgetControl = new QGstreamerVideoWidgetControl(this); #endif @@ -169,11 +169,11 @@ QMediaControl *CameraBinService::requestControl(const char *name) if (!m_videoOutput) { if (qstrcmp(name, QVideoRendererControl_iid) == 0) { m_videoOutput = m_videoRenderer; - } -#if defined(HAVE_XVIDEO) && defined(HAVE_WIDGETS) - else if (qstrcmp(name, QVideoWindowControl_iid) == 0) { + } else if (qstrcmp(name, QVideoWindowControl_iid) == 0) { m_videoOutput = m_videoWindow; - } else if (qstrcmp(name, QVideoWidgetControl_iid) == 0) { + } +#if defined(HAVE_WIDGETS) + else if (qstrcmp(name, QVideoWidgetControl_iid) == 0) { m_videoOutput = m_videoWidgetControl; } #endif |