slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Multimedia: examples coding style unification

Browse Source 
Change-Id: Iffae3a276bb2b01f871aee76dc069ce006d69fce
Reviewed-by: David Schulz <david.schulz@digia.com>
This commit is contained in:
hjk
2012-11-20 18:27:28 +01:00
committed by The Qt Project
parent 9f4d6e824c
commit 21c3915205
69 changed files with 394 additions and 466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/customvideosurface/customvideoitem/customvideoitem.pro
View File

@@ -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

4
examples/customvideosurface/customvideoitem/main.cpp
View File

@@ -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);

5
examples/customvideosurface/customvideoitem/videoitem.cpp
View File

@@ -40,8 +40,9 @@
#include "videoitem.h"
#include <QtWidgets>
#include <qvideosurfaceformat.h>
#include <QPainter>
#include <QTransform>
#include <QVideoSurfaceFormat>
VideoItem::VideoItem(QGraphicsItem *parent)
: QGraphicsItem(parent)

10
examples/customvideosurface/customvideoitem/videoitem.h
View File

@@ -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

8
examples/customvideosurface/customvideoitem/videoplayer.cpp
View File

@@ -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)

13
examples/customvideosurface/customvideoitem/videoplayer.h
View File

@@ -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

4
examples/customvideosurface/customvideowidget/customvideowidget.pro
View File

@@ -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

10
examples/customvideosurface/customvideowidget/videoplayer.h
View File

@@ -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

11
examples/customvideosurface/customvideowidget/videowidget.h
View File

@@ -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

9
examples/customvideosurface/customvideowidget/videowidgetsurface.h
View File

@@ -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);