Commit 400978cf authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf Committed by Hugo Beauzee-Luyssen

Remove unneeded slots in Renderer. Use connect( signal(), signal()) instead

Signed-off-by: default avatarHugo Beauzee-Luyssen <beauze.h@gmail.com>
parent b7e00693
......@@ -37,8 +37,8 @@ ClipRenderer::ClipRenderer() :
m_mediaChanged( false )
{
connect( m_mediaPlayer, SIGNAL( stopped() ), this, SLOT( __videoStopped() ) );
connect( m_mediaPlayer, SIGNAL( paused() ), this, SLOT( __videoPaused() ) );
connect( m_mediaPlayer, SIGNAL( playing() ), this, SLOT( __videoPlaying() ) );
connect( m_mediaPlayer, SIGNAL( paused() ), this, SIGNAL( paused() ) );
connect( m_mediaPlayer, SIGNAL( playing() ), this, SIGNAL( playing() ) );
connect( m_mediaPlayer, SIGNAL( timeChanged( qint64 ) ), this, SLOT( __timeChanged( qint64 ) ) );
connect( m_mediaPlayer, SIGNAL( endReached() ), this, SLOT( __endReached() ) );
}
......@@ -231,10 +231,6 @@ void ClipRenderer::previewWidgetCursorChanged( qint64 newFrame )
/////////////////////////////////////////////////////////////////////
/////SLOTS :
/////////////////////////////////////////////////////////////////////
void ClipRenderer::__videoPaused()
{
emit paused();
}
void ClipRenderer::__videoStopped()
{
......@@ -242,11 +238,6 @@ void ClipRenderer::__videoStopped()
emit stopped();
}
void ClipRenderer::__videoPlaying()
{
emit playing();
}
//void ClipRenderer::__positionChanged()
//{
// if ( m_clipLoaded == false)
......
......@@ -72,8 +72,6 @@ public slots:
// void __positionChanged();
void __timeChanged( qint64 time );
void __videoPaused();
void __videoPlaying();
void __endReached();
void __videoStopped();
};
......
......@@ -139,8 +139,6 @@ protected:
public slots:
virtual void __videoPaused() = 0;
virtual void __videoPlaying() = 0;
virtual void __endReached() = 0;
virtual void setClip( Clip* ) = 0;
virtual void setMedia( Media* ) = 0;
......
......@@ -71,7 +71,7 @@ void WorkflowRenderer::initializeRenderer()
connect( m_mainWorkflow, SIGNAL( mainWorkflowUnpaused() ), this, SLOT( mainWorkflowUnpaused() ), Qt::QueuedConnection );
connect( m_mainWorkflow, SIGNAL( mainWorkflowEndReached() ), this, SLOT( __endReached() ) );
connect( m_mainWorkflow, SIGNAL( frameChanged( qint64, MainWorkflow::FrameChangedReason ) ),
this, SLOT( __frameChanged( qint64, MainWorkflow::FrameChangedReason ) ) );
this, SIGNAL( frameChanged( qint64, MainWorkflow::FrameChangedReason ) ) );
}
WorkflowRenderer::~WorkflowRenderer()
......@@ -132,10 +132,10 @@ void WorkflowRenderer::startPreview()
m_mediaPlayer->setMedia( m_media );
//Media player part: to update PreviewWidget
connect( m_mediaPlayer, SIGNAL( playing() ), this, SLOT( __videoPlaying() ), Qt::DirectConnection );
connect( m_mediaPlayer, SIGNAL( paused() ), this, SLOT( __videoPaused() ), Qt::DirectConnection );
connect( m_mediaPlayer, SIGNAL( playing() ), this, SIGNAL( playing() ), Qt::DirectConnection );
connect( m_mediaPlayer, SIGNAL( paused() ), this, SIGNAL( paused() ), Qt::DirectConnection );
//FIXME:: check if this doesn't require Qt::QueuedConnection
connect( m_mediaPlayer, SIGNAL( stopped() ), this, SLOT( __videoStopped() ) );
connect( m_mediaPlayer, SIGNAL( stopped() ), this, SIGNAL( endReached() ) );
m_mainWorkflow->setFullSpeedRender( false );
m_mainWorkflow->startRender();
......@@ -357,23 +357,3 @@ void WorkflowRenderer::__endReached()
emit endReached();
}
void WorkflowRenderer::__frameChanged( qint64 frame, MainWorkflow::FrameChangedReason reason )
{
emit frameChanged( frame, reason );
}
void WorkflowRenderer::__videoPlaying()
{
emit playing();
}
void WorkflowRenderer::__videoStopped()
{
emit endReached();
}
void WorkflowRenderer::__videoPaused()
{
emit paused();
}
......@@ -105,10 +105,6 @@ class WorkflowRenderer : public GenericRenderer
void rulerCursorChanged( qint64 newFrame );
void previewWidgetCursorChanged( qint64 newFrame );
virtual void __frameChanged( qint64 frame, MainWorkflow::FrameChangedReason );
void __videoPaused();
void __videoStopped();
void __videoPlaying();
void __endReached();
private slots:
......
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