diff options
author | Yoann Lopes <yoann.lopes@digia.com> | 2013-09-20 14:02:24 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-20 14:37:06 +0200 |
commit | c3ca3a760e85fc66146d61b2f3ac09e97197b9e9 (patch) | |
tree | a2102899637bce3f7c3f4de04fd0fad958c25b28 /src/gsttools/gsttools.pro | |
parent | ac029c65f273ce5dd20da8e84d1bcff2fd6749d4 (diff) | |
download | qtmultimedia-c3ca3a760e85fc66146d61b2f3ac09e97197b9e9.tar.gz |
Some cleanup in the GStreamer plugin.
Removed QGstreamerVideoOverlay and related classes. It was used as
'Window' control but performs worse than QGstreamerVideoWindow which
does basically the same thing using GStreamer ready-made components
instead.
Removed X11 dependencies and related configuration tests. It was only
needed for QGstreamerVideoOverlay.
Change-Id: I2ad2636ccf0060e56cd64f3d9e5b3c24dc75f5a3
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Diffstat (limited to 'src/gsttools/gsttools.pro')
-rw-r--r-- | src/gsttools/gsttools.pro | 28 |
1 files changed, 6 insertions, 22 deletions
diff --git a/src/gsttools/gsttools.pro b/src/gsttools/gsttools.pro index d3025797b..d24d89390 100644 --- a/src/gsttools/gsttools.pro +++ b/src/gsttools/gsttools.pro @@ -49,6 +49,7 @@ PRIVATE_HEADERS += \ qgstcodecsinfo_p.h \ qgstreamervideoprobecontrol_p.h \ qgstreameraudioprobecontrol_p.h \ + qgstreamervideowindow_p.h SOURCES += \ qgstbufferpoolinterface.cpp \ @@ -65,33 +66,16 @@ SOURCES += \ gstvideoconnector.c \ qgstreamervideoprobecontrol.cpp \ qgstreameraudioprobecontrol.cpp \ + qgstreamervideowindow.cpp -config_xvideo { - DEFINES += HAVE_XVIDEO - - LIBS += -lXv -lX11 -lXext +qtHaveModule(widgets) { + QT += multimediawidgets PRIVATE_HEADERS += \ - qgstxvimagebuffer_p.h \ + qgstreamervideowidget_p.h SOURCES += \ - qgstxvimagebuffer.cpp \ - - qtHaveModule(widgets) { - QT += multimediawidgets - - PRIVATE_HEADERS += \ - qgstreamervideooverlay_p.h \ - qgstreamervideowindow_p.h \ - qgstreamervideowidget_p.h \ - qx11videosurface_p.h \ - - SOURCES += \ - qgstreamervideooverlay.cpp \ - qgstreamervideowindow.cpp \ - qgstreamervideowidget.cpp \ - qx11videosurface.cpp \ - } + qgstreamervideowidget.cpp } maemo6 { |