diff options
Diffstat (limited to 'examples/customvideosurface')
10 files changed, 35 insertions, 43 deletions
diff --git a/examples/customvideosurface/customvideoitem/customvideoitem.pro b/examples/customvideosurface/customvideoitem/customvideoitem.pro index a2a7a1e6e..92d1e8dbc 100644 --- a/examples/customvideosurface/customvideoitem/customvideoitem.pro +++ b/examples/customvideosurface/customvideoitem/customvideoitem.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = customvideoitem -QT += multimedia multimediawidgets +QT += multimedia multimediawidgets widgets contains(QT_CONFIG, opengl): QT += opengl @@ -17,5 +17,3 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/customvideoitem INSTALLS += target sources - -QT+=widgets diff --git a/examples/customvideosurface/customvideoitem/main.cpp b/examples/customvideosurface/customvideoitem/main.cpp index d1899c7bb..18f602f88 100644 --- a/examples/customvideosurface/customvideoitem/main.cpp +++ b/examples/customvideosurface/customvideoitem/main.cpp @@ -40,9 +40,9 @@ #include "videoplayer.h" -#include <QtWidgets/QApplication> +#include <QApplication> -int main(int argc, char **argv) +int main(int argc, char *argv[]) { QApplication app(argc, argv); diff --git a/examples/customvideosurface/customvideoitem/videoitem.cpp b/examples/customvideosurface/customvideoitem/videoitem.cpp index f42d8bbd5..db6651efd 100644 --- a/examples/customvideosurface/customvideoitem/videoitem.cpp +++ b/examples/customvideosurface/customvideoitem/videoitem.cpp @@ -40,8 +40,9 @@ #include "videoitem.h" -#include <QtWidgets> -#include <qvideosurfaceformat.h> +#include <QPainter> +#include <QTransform> +#include <QVideoSurfaceFormat> VideoItem::VideoItem(QGraphicsItem *parent) : QGraphicsItem(parent) diff --git a/examples/customvideosurface/customvideoitem/videoitem.h b/examples/customvideosurface/customvideoitem/videoitem.h index 75261dded..28360577b 100644 --- a/examples/customvideosurface/customvideoitem/videoitem.h +++ b/examples/customvideosurface/customvideoitem/videoitem.h @@ -41,8 +41,8 @@ #ifndef VIDEOITEM_H #define VIDEOITEM_H -#include <qabstractvideosurface.h> -#include <QtWidgets/QGraphicsItem> +#include <QAbstractVideoSurface> +#include <QGraphicsItem> class VideoItem : public QAbstractVideoSurface, @@ -50,13 +50,13 @@ class VideoItem { Q_OBJECT Q_INTERFACES(QGraphicsItem) + public: explicit VideoItem(QGraphicsItem *parentItem = 0); ~VideoItem(); QRectF boundingRect() const; - void paint( - QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); //video surface QList<QVideoFrame::PixelFormat> supportedPixelFormats( @@ -74,5 +74,5 @@ private: bool framePainted; }; -#endif +#endif // VIDEOITEM_H diff --git a/examples/customvideosurface/customvideoitem/videoplayer.cpp b/examples/customvideosurface/customvideoitem/videoplayer.cpp index da4aa88c9..c76160da3 100644 --- a/examples/customvideosurface/customvideoitem/videoplayer.cpp +++ b/examples/customvideosurface/customvideoitem/videoplayer.cpp @@ -42,14 +42,14 @@ #include "videoitem.h" #include <QtWidgets> -#include <qvideosurfaceformat.h> +#include <QVideoSurfaceFormat> #if !defined(QT_NO_OPENGL) -# include <QtOpenGL/QGLWidget> +# include <QGLWidget> #endif -VideoPlayer::VideoPlayer(QWidget *parent, Qt::WindowFlags flags) - : QWidget(parent, flags) +VideoPlayer::VideoPlayer(QWidget *parent) + : QWidget(parent) , mediaPlayer(0, QMediaPlayer::VideoSurface) , videoItem(0) , playButton(0) diff --git a/examples/customvideosurface/customvideoitem/videoplayer.h b/examples/customvideosurface/customvideoitem/videoplayer.h index 2fcbe09f5..5b4db4e4d 100644 --- a/examples/customvideosurface/customvideoitem/videoplayer.h +++ b/examples/customvideosurface/customvideoitem/videoplayer.h @@ -41,24 +41,23 @@ #ifndef VIDEOPLAYER_H #define VIDEOPLAYER_H -#include <qmediaplayer.h> - -#include <QtGui/QMovie> -#include <QtWidgets/QWidget> +#include <QMediaPlayer> +#include <QMovie> +#include <QWidget> QT_BEGIN_NAMESPACE class QAbstractButton; class QSlider; QT_END_NAMESPACE - class VideoItem; class VideoPlayer : public QWidget { Q_OBJECT + public: - VideoPlayer(QWidget *parent = 0, Qt::WindowFlags flags = 0); + VideoPlayer(QWidget *parent = 0); ~VideoPlayer(); QSize sizeHint() const { return QSize(800, 600); } @@ -81,5 +80,5 @@ private: QSlider *positionSlider; }; -#endif +#endif // VIDEOPLAYER_H diff --git a/examples/customvideosurface/customvideowidget/customvideowidget.pro b/examples/customvideosurface/customvideowidget/customvideowidget.pro index c3ac2cde0..ddea2f7ea 100644 --- a/examples/customvideosurface/customvideowidget/customvideowidget.pro +++ b/examples/customvideosurface/customvideowidget/customvideowidget.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = customvideowidget -QT += multimedia multimediawidgets +QT += multimedia multimediawidgets widgets HEADERS = \ videoplayer.h \ @@ -19,5 +19,3 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/customvideowidget INSTALLS += target sources - -QT+=widgets diff --git a/examples/customvideosurface/customvideowidget/videoplayer.h b/examples/customvideosurface/customvideowidget/videoplayer.h index ddad18724..7aff44fbb 100644 --- a/examples/customvideosurface/customvideowidget/videoplayer.h +++ b/examples/customvideosurface/customvideowidget/videoplayer.h @@ -41,10 +41,9 @@ #ifndef VIDEOPLAYER_H #define VIDEOPLAYER_H -#include <qmediaplayer.h> - -#include <QtGui/QMovie> -#include <QtWidgets/QWidget> +#include <QMediaPlayer> +#include <QMovie> +#include <QWidget> QT_BEGIN_NAMESPACE class QAbstractButton; @@ -54,6 +53,7 @@ QT_END_NAMESPACE class VideoPlayer : public QWidget { Q_OBJECT + public: VideoPlayer(QWidget *parent = 0); ~VideoPlayer(); @@ -74,4 +74,4 @@ private: QSlider *positionSlider; }; -#endif +#endif // VIDEOPLAYER_H diff --git a/examples/customvideosurface/customvideowidget/videowidget.h b/examples/customvideosurface/customvideowidget/videowidget.h index c7688dd38..9b9bd0f38 100644 --- a/examples/customvideosurface/customvideowidget/videowidget.h +++ b/examples/customvideosurface/customvideowidget/videowidget.h @@ -43,18 +43,13 @@ #include "videowidgetsurface.h" -#include <QtWidgets/QWidget> - -QT_BEGIN_NAMESPACE -class QAbstractVideoSurface; -QT_END_NAMESPACE - -class VideoWidgetSurface; +#include <QWidget> //! [0] class VideoWidget : public QWidget { Q_OBJECT + public: VideoWidget(QWidget *parent = 0); ~VideoWidget(); @@ -72,4 +67,4 @@ private: }; //! [0] -#endif +#endif // VIDEOWIDGET_H diff --git a/examples/customvideosurface/customvideowidget/videowidgetsurface.h b/examples/customvideosurface/customvideowidget/videowidgetsurface.h index 6cfa346b0..3e9c40bd2 100644 --- a/examples/customvideosurface/customvideowidget/videowidgetsurface.h +++ b/examples/customvideosurface/customvideowidget/videowidgetsurface.h @@ -41,15 +41,16 @@ #ifndef VIDEOWIDGETSURFACE_H #define VIDEOWIDGETSURFACE_H -#include <QtCore/QRect> -#include <QtGui/QImage> -#include <qabstractvideosurface.h> -#include <qvideoframe.h> +#include <QAbstractVideoSurface> +#include <QImage> +#include <QRect> +#include <QVideoFrame> //! [0] class VideoWidgetSurface : public QAbstractVideoSurface { Q_OBJECT + public: VideoWidgetSurface(QWidget *widget, QObject *parent = 0); |