[vlmc-devel] GenericRenderer: Remove setRenderWidget
Yikai Lu
git at videolan.org
Fri Apr 22 16:05:38 CEST 2016
vlmc | branch: master | Yikai Lu <luyikei.qmltu at gmail.com> | Mon Apr 18 17:32:20 2016 +0900| [0324217bdefcd8db07f0b5d0598e06dea77e6c4d] | committer: Hugo Beauzée-Luyssen
GenericRenderer: Remove setRenderWidget
Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>
> https://code.videolan.org/videolan/vlmc/commit/0324217bdefcd8db07f0b5d0598e06dea77e6c4d
---
src/Gui/preview/PreviewWidget.cpp | 2 --
src/Renderer/ClipRenderer.cpp | 1 -
src/Renderer/GenericRenderer.cpp | 6 ------
src/Renderer/GenericRenderer.h | 14 --------------
src/Renderer/WorkflowRenderer.cpp | 2 --
5 files changed, 25 deletions(-)
diff --git a/src/Gui/preview/PreviewWidget.cpp b/src/Gui/preview/PreviewWidget.cpp
index a50e9a9..6564d3b 100644
--- a/src/Gui/preview/PreviewWidget.cpp
+++ b/src/Gui/preview/PreviewWidget.cpp
@@ -71,8 +71,6 @@ PreviewWidget::setRenderer(GenericRenderer *renderer)
// Give the renderer to the ruler
m_ui->rulerWidget->setRenderer( m_renderer );
- m_renderer->setRenderWidget( m_ui->renderWidget );
-
#if defined ( Q_OS_MAC )
/* Releases the NSView in the RenderWidget*/
m_ui->renderWidget->release();
diff --git a/src/Renderer/ClipRenderer.cpp b/src/Renderer/ClipRenderer.cpp
index 13bf721..d54389f 100644
--- a/src/Renderer/ClipRenderer.cpp
+++ b/src/Renderer/ClipRenderer.cpp
@@ -89,7 +89,6 @@ ClipRenderer::startPreview()
delete m_sourceRenderer;
m_sourceRenderer = m_selectedClip->media()->source()->createRenderer( m_eventWatcher );
- m_sourceRenderer->setOutputWidget( (void *) static_cast< RenderWidget* >( m_renderWidget )->id() );
connect( m_eventWatcher, SIGNAL( stopped() ), this, SLOT( videoStopped() ) );
connect( m_eventWatcher, SIGNAL( paused() ), this, SIGNAL( paused() ) );
diff --git a/src/Renderer/GenericRenderer.cpp b/src/Renderer/GenericRenderer.cpp
index 6ed435a..df16cf5 100644
--- a/src/Renderer/GenericRenderer.cpp
+++ b/src/Renderer/GenericRenderer.cpp
@@ -38,12 +38,6 @@ GenericRenderer::~GenericRenderer()
}
#ifdef WITH_GUI
-void
-GenericRenderer::setRenderWidget(QWidget *renderWidget)
-{
- m_renderWidget = renderWidget;
-}
-
RendererEventWatcher*
GenericRenderer::eventWatcher()
{
diff --git a/src/Renderer/GenericRenderer.h b/src/Renderer/GenericRenderer.h
index 5cb34f5..3ed1cb4 100644
--- a/src/Renderer/GenericRenderer.h
+++ b/src/Renderer/GenericRenderer.h
@@ -26,9 +26,6 @@
#include "config.h"
#include <QObject>
-#ifdef WITH_GUI
-# include <QWidget>
-#endif
#include "EffectsEngine/EffectUser.h"
#include "Workflow/Types.h"
@@ -51,15 +48,6 @@ protected:
public:
virtual ~GenericRenderer();
-#ifdef WITH_GUI
- /**
- * \brief Set the widget used for rendering the output.
- * \param renderWidget The widget to use for render.
- * \sa setPreviewLabel( QLabel* )
- */
- void setRenderWidget( QWidget* renderWidget );
-#endif
-
/**
* \brief Set the output volume.
* \param volume the volume (int)
@@ -174,8 +162,6 @@ protected:
*/
bool m_paused;
- QWidget* m_renderWidget;
-
public slots:
/**
* \brief This SLOT will be called when the time cursor has changed.
diff --git a/src/Renderer/WorkflowRenderer.cpp b/src/Renderer/WorkflowRenderer.cpp
index c6fafc2..4caffb3 100644
--- a/src/Renderer/WorkflowRenderer.cpp
+++ b/src/Renderer/WorkflowRenderer.cpp
@@ -87,8 +87,6 @@ WorkflowRenderer::setupRenderer()
m_sourceRenderer = m_source->createRenderer( m_eventWatcher );
m_sourceRenderer->setName( "WorkflowRenderer" );
m_sourceRenderer->enableMemoryInput( m_esHandler, getLockCallback(), getUnlockCallback() );
- if ( m_renderWidget != nullptr )
- m_sourceRenderer->setOutputWidget( (void *) static_cast< RenderWidget* >( m_renderWidget )->id() );
}
int
More information about the Vlmc-devel
mailing list