Commit 8253bb26 authored by Hugo Beauzee-Luyssen's avatar Hugo Beauzee-Luyssen

Changed filename and classname for splitting previews/renderer

parent cdb7ab4b
/*****************************************************************************
* ClipPreviewWidget: Preview widget
* ClipRenderer.cpp: Render from a Clip (mainly for previewing purpose)
*****************************************************************************
* Copyright (C) 2008-2009 the VLMC team
*
......
/*****************************************************************************
* ClipPreviewWidget.cpp: Preview widget
* ClipRenderer.h: Preview widget
*****************************************************************************
* Copyright (C) 2008-2009 the VLMC team
*
......@@ -20,8 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifndef CLIPPREVIEWWIDGET_H
#define CLIPPREVIEWWIDGET_H
#ifndef CLIPRENDERER_H
#define CLIPRENDERER_H
#include <QWidget>
#include <QObject>
......@@ -31,14 +31,14 @@
#include "GenericPreviewWidget.h"
//TODO: This should really share a common interface with RenderPreviewWorkflow
class ClipPreviewWidget : public GenericPreviewWidget
class ClipRenderer : public GenericRenderer
{
Q_OBJECT
Q_DISABLE_COPY( ClipPreviewWidget )
Q_DISABLE_COPY( ClipRenderer )
public:
explicit ClipPreviewWidget( QWidget* renderWidget );
virtual ~ClipPreviewWidget();
explicit ClipRenderer( QWidget* renderWidget );
virtual ~ClipRenderer();
virtual void startPreview( Media* media );
virtual void setPosition( float newPos );
......@@ -59,4 +59,4 @@ public slots:
void __videoStopped();
};
#endif // CLIPPREVIEWWIDGET_H
#endif // CLIPRENDERER_H
/*****************************************************************************
* GenericPreviewWidget.h: Describe a common behavior for every preview widget
* GenericRenderer.h: Describe a common behavior for every renderers
*****************************************************************************
* Copyright (C) 2008-2009 the VLMC team
*
......@@ -20,8 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifndef GENERICPREVIEWWIDGET_H
#define GENERICPREVIEWWIDGET_H
#ifndef GENERICRENDERER_H
#define GENERICRENDERER_H
#include <QObject>
#include <QWidget>
......@@ -29,20 +29,20 @@
#include "Media.h"
#include "VLCMediaPlayer.h"
class GenericPreviewWidget : public QObject
class GenericRenderer : public QObject
{
Q_OBJECT
Q_DISABLE_COPY( GenericPreviewWidget );
Q_DISABLE_COPY( GenericRenderer );
public:
explicit GenericPreviewWidget( QWidget* renderWidget ) :
explicit GenericRenderer( QWidget* renderWidget ) :
m_paused( false ),
m_isRendering( false )
{
m_mediaPlayer = new LibVLCpp::MediaPlayer();
m_mediaPlayer->setDrawable( renderWidget->winId() );
}
virtual ~GenericPreviewWidget()
virtual ~GenericRenderer()
{
delete m_mediaPlayer;
}
......@@ -84,11 +84,11 @@ public slots:
virtual void __endReached() = 0;
signals:
void stopped();
void paused();
void playing();
void positionChanged( float );
void endReached();
void stopped();
void paused();
void playing();
void positionChanged( float );
void endReached();
};
#endif // GENERICPREVIEWWIDGET_H
#endif // GENERICRENDERER_H
/*****************************************************************************
* RenderPreviewWidget.h: Allow a current workflow preview
* WorkflowRenderer.h: Render the main workflow
*****************************************************************************
* Copyright (C) 2008-2009 the VLMC team
*
......@@ -20,8 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifndef RENDERPREVIEWWIDGET_H
#define RENDERPREVIEWWIDGET_H
#ifndef WORKFLOWRENDERER_H
#define WORKFLOWRENDERER_H
#include <QObject>
......@@ -30,14 +30,14 @@
#include "Workflow/MainWorkflow.h"
#include "GenericPreviewWidget.h"
class RenderPreviewWidget : public GenericPreviewWidget
class WorkflowRenderer : public GenericPreviewWidget
{
Q_OBJECT
Q_DISABLE_COPY( RenderPreviewWidget )
Q_DISABLE_COPY( WorkflowRenderer )
public:
RenderPreviewWidget( MainWorkflow* mainWorkflow, QWidget* renderWidget );
~RenderPreviewWidget();
WorkflowRenderer( MainWorkflow* mainWorkflow, QWidget* renderWidget );
~WorkflowRenderer();
virtual void startPreview( Media* );
void stopPreview();
......@@ -72,4 +72,4 @@ class RenderPreviewWidget : public GenericPreviewWidget
void __endReached();
};
#endif // RENDERPREVIEWWIDGET_H
#endif // WORKFLOWRENDERER_H
......@@ -21,7 +21,7 @@ SOURCES += src/main.cpp \
src/LibVLCpp/VLCMedia.cpp \
src/gui/TracksView.cpp \
src/gui/TracksScene.cpp \
src/gui/ClipPreviewWidget.cpp \
src/gui/ClipRenderer.cpp \
src/gui/TracksRuler.cpp \
src/gui/Preferences.cpp \
src/gui/ListViewMediaItem.cpp \
......@@ -41,7 +41,7 @@ SOURCES += src/main.cpp \
src/Workflow/TrackWorkflow.cpp \
src/Workflow/MainWorkflow.cpp \
src/gui/PreviewWidget.cpp \
src/gui/RenderPreviewWidget.cpp \
src/gui/WorkflowRenderer.cpp \
src/API/vlmc_module_variables.cpp \
src/API/Module.cpp \
src/API/ModuleManager.cpp \
......@@ -57,7 +57,7 @@ HEADERS += src/gui/MainWindow.h \
src/LibVLCpp/VLCMedia.h \
src/gui/TracksView.h \
src/gui/TracksScene.h \
src/gui/ClipPreviewWidget.h \
src/gui/ClipRenderer.h \
src/gui/TracksRuler.h \
src/gui/Preferences.h \
src/gui/ListViewMediaItem.h \
......@@ -79,8 +79,8 @@ HEADERS += src/gui/MainWindow.h \
src/Workflow/TrackWorkflow.h \
src/Workflow/MainWorkflow.h \
src/gui/PreviewWidget.h \
src/gui/RenderPreviewWidget.h \
src/gui/GenericPreviewWidget.h \
src/gui/WorkflowRenderer.h \
src/gui/GenericRenderer.h \
src/tools/Toggleable.hpp \
src/API/vlmc_module.h \
src/API/Module.h \
......@@ -106,6 +106,7 @@ RESOURCES += ressources.qrc
INCLUDEPATH += src/LibVLCpp \
src/gui \
src/tools \
src/renderer
src
LIBS = -L/usr/local/lib \
-lvlc
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment