Skip to content

Commit

Permalink
vo.dtor not pure virtual
Browse files Browse the repository at this point in the history
  • Loading branch information
wang-bin committed Dec 26, 2013
1 parent 97128a9 commit 6c11e95
Show file tree
Hide file tree
Showing 16 changed files with 1 addition and 37 deletions.
1 change: 0 additions & 1 deletion qml/QmlAV/QQuickItemRenderer.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ class QMLAV_EXPORT QQuickItemRenderer : public QQuickItem, public VideoRenderer
};

explicit QQuickItemRenderer(QQuickItem *parent = 0);
~QQuickItemRenderer() {}
virtual VideoRendererId id() const;
virtual bool receiveFrame(const VideoFrame &frame);

Expand Down
4 changes: 0 additions & 4 deletions src/Direct2DRenderer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,6 @@ Direct2DRenderer::Direct2DRenderer(QWidget *parent, Qt::WindowFlags f):
setAttribute(Qt::WA_PaintOnScreen, true);
}

Direct2DRenderer::~Direct2DRenderer()
{
}

bool Direct2DRenderer::receiveFrame(const VideoFrame& frame)
{
DPTR_D(Direct2DRenderer);
Expand Down
4 changes: 0 additions & 4 deletions src/GDIRenderer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,6 @@ GDIRenderer::GDIRenderer(QWidget *parent, Qt::WindowFlags f):
setAttribute(Qt::WA_PaintOnScreen, true);
}

GDIRenderer::~GDIRenderer()
{
}

QPaintEngine* GDIRenderer::paintEngine() const
{
return 0;
Expand Down
4 changes: 0 additions & 4 deletions src/GLWidgetRenderer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -171,10 +171,6 @@ GLWidgetRenderer::GLWidgetRenderer(QWidget *parent, const QGLWidget* shareWidget
setOSDFilter(new OSDFilterQPainter());
}

GLWidgetRenderer::~GLWidgetRenderer()
{
}

bool GLWidgetRenderer::receiveFrame(const VideoFrame& frame)
{
DPTR_D(GLWidgetRenderer);
Expand Down
4 changes: 0 additions & 4 deletions src/GraphicsItemRenderer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,6 @@ GraphicsItemRenderer::GraphicsItemRenderer(GraphicsItemRendererPrivate &d, QGrap
#endif //CONFIG_GRAPHICSWIDGET
}

GraphicsItemRenderer::~GraphicsItemRenderer()
{
}

bool GraphicsItemRenderer::receiveFrame(const VideoFrame& frame)
{
prepareFrame(frame);
Expand Down
4 changes: 0 additions & 4 deletions src/QPainterRenderer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,6 @@ QPainterRenderer::QPainterRenderer(QPainterRendererPrivate &d)
setOSDFilter(new OSDFilterQPainter());
}

QPainterRenderer::~QPainterRenderer()
{
}

int QPainterRenderer::filterContextType() const
{
return FilterContext::QtPainter;
Expand Down
1 change: 0 additions & 1 deletion src/QtAV/Direct2DRenderer.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ class Q_AV_EXPORT Direct2DRenderer : public QWidget, public VideoRenderer
DPTR_DECLARE_PRIVATE(Direct2DRenderer)
public:
Direct2DRenderer(QWidget* parent = 0, Qt::WindowFlags f = 0);
virtual ~Direct2DRenderer();
virtual VideoRendererId id() const;

/* WA_PaintOnScreen: To render outside of Qt's paint system, e.g. If you require
Expand Down
1 change: 0 additions & 1 deletion src/QtAV/GDIRenderer.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ class Q_AV_EXPORT GDIRenderer : public QWidget, public VideoRenderer
DPTR_DECLARE_PRIVATE(GDIRenderer)
public:
GDIRenderer(QWidget* parent = 0, Qt::WindowFlags f = 0); //offscreen?
virtual ~GDIRenderer();
virtual VideoRendererId id() const;
/* WA_PaintOnScreen: To render outside of Qt's paint system, e.g. If you require
* native painting primitives, you need to reimplement QWidget::paintEngine() to
Expand Down
1 change: 0 additions & 1 deletion src/QtAV/GLWidgetRenderer.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ class Q_AV_EXPORT GLWidgetRenderer : public QGLWidget, public VideoRenderer
DPTR_DECLARE_PRIVATE(GLWidgetRenderer)
public:
GLWidgetRenderer(QWidget* parent = 0, const QGLWidget* shareWidget = 0, Qt::WindowFlags f = 0);
virtual ~GLWidgetRenderer();
virtual VideoRendererId id() const;

protected:
Expand Down
1 change: 0 additions & 1 deletion src/QtAV/GraphicsItemRenderer.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ class Q_AV_EXPORT GraphicsItemRenderer : public GraphicsWidget, public QPainterR
DPTR_DECLARE_PRIVATE(GraphicsItemRenderer)
public:
GraphicsItemRenderer(QGraphicsItem * parent = 0);
virtual ~GraphicsItemRenderer();
virtual VideoRendererId id() const;

QRectF boundingRect() const;
Expand Down
1 change: 0 additions & 1 deletion src/QtAV/QPainterRenderer.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ class Q_AV_EXPORT QPainterRenderer : public VideoRenderer
DPTR_DECLARE_PRIVATE(QPainterRenderer)
public:
QPainterRenderer();
virtual ~QPainterRenderer();
virtual VideoRendererId id () const;
virtual int filterContextType() const;
//virtual QImage currentFrameImage() const;
Expand Down
2 changes: 1 addition & 1 deletion src/QtAV/VideoRenderer.h
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class Q_AV_EXPORT VideoRenderer : public AVOutput
};

VideoRenderer();
virtual ~VideoRenderer() = 0;
virtual ~VideoRenderer();
virtual VideoRendererId id() const = 0;

bool receive(const VideoFrame& frame);
Expand Down
1 change: 0 additions & 1 deletion src/QtAV/WidgetRenderer.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ class Q_AV_EXPORT WidgetRenderer : public QWidget, public QPainterRenderer
DPTR_DECLARE_PRIVATE(WidgetRenderer)
public:
explicit WidgetRenderer(QWidget *parent = 0, Qt::WindowFlags f = 0);
virtual ~WidgetRenderer();
virtual VideoRendererId id() const;
signals:
void imageReady();
Expand Down
1 change: 0 additions & 1 deletion src/QtAV/XVRenderer.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ class Q_AV_EXPORT XVRenderer : public QWidget, public VideoRenderer
DPTR_DECLARE_PRIVATE(XVRenderer)
public:
XVRenderer(QWidget* parent = 0, Qt::WindowFlags f = 0);
virtual ~XVRenderer();
virtual VideoRendererId id() const;

/* WA_PaintOnScreen: To render outside of Qt's paint system, e.g. If you require
Expand Down
4 changes: 0 additions & 4 deletions src/WidgetRenderer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,6 @@ WidgetRenderer::WidgetRenderer(WidgetRendererPrivate &d, QWidget *parent, Qt::Wi
connect(this, SIGNAL(imageReady()), SLOT(update()));
}

WidgetRenderer::~WidgetRenderer()
{
}

bool WidgetRenderer::receiveFrame(const VideoFrame &frame)
{
prepareFrame(frame);
Expand Down
4 changes: 0 additions & 4 deletions src/XVRenderer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,6 @@ XVRenderer::XVRenderer(QWidget *parent, Qt::WindowFlags f):
setAttribute(Qt::WA_PaintOnScreen, true);
}

XVRenderer::~XVRenderer()
{
}

bool XVRenderer::receiveFrame(const VideoFrame& frame)
{
DPTR_D(XVRenderer);
Expand Down

0 comments on commit 6c11e95

Please sign in to comment.