Commit f1ad9247 authored by Hugo Beauzee-Luyssen's avatar Hugo Beauzee-Luyssen

Merge branch 'master' into chouquette_sound_workflow

Conflicts:
	src/Renderer/WorkflowRenderer.cpp
parents c3e252c0 400978cf
......@@ -38,8 +38,8 @@ ImportMediaListController::~ImportMediaListController()
void ImportMediaListController::addMedia( Media* media )
{
ImportMediaCellView* cell = new ImportMediaCellView( media->getUuid() );
connect( cell, SIGNAL( cellSelected( const QUuid& ) ), this, SLOT( mediaSelection( const QUuid& ) ) );
connect( cell, SIGNAL( cellDeleted( const QUuid& ) ), this, SLOT( mediaDeletion( const QUuid& ) ) );
connect( cell, SIGNAL( cellSelected( const QUuid& ) ), this, SIGNAL( mediaSelected( const QUuid& ) ) );
connect( cell, SIGNAL( cellDeleted( const QUuid& ) ), this, SIGNAL( mediaDeleted( const QUuid& ) ) );
connect( cell, SIGNAL( arrowClicked( const QUuid& ) ), this, SIGNAL( showClipListAsked( const QUuid& ) ) );
cell->setTitle( media->getFileName() );
......@@ -75,7 +75,7 @@ void ImportMediaListController::removeMedia( const QUuid& uuid )
void ImportMediaListController::addClip( Clip* clip )
{
ImportMediaCellView* cell = new ImportMediaCellView( clip->getUuid() );
connect( cell, SIGNAL( cellSelected( const QUuid& ) ), this, SLOT( clipSelection( const QUuid& ) ) );
connect( cell, SIGNAL( cellSelected( const QUuid& ) ), this, SIGNAL( clipSelected( const QUuid& ) ) );
connect( cell, SIGNAL( cellDeleted( const QUuid& ) ), this, SLOT( clipDeletion( const QUuid& ) ) );
QString size;
......@@ -116,27 +116,12 @@ void ImportMediaListController::addClipsFromMedia( Media* media )
addClip( media->clips()->value( uuid ) );
}
void ImportMediaListController::mediaSelection( const QUuid& uuid )
{
emit mediaSelected( uuid );
}
void ImportMediaListController::clipSelection( const QUuid& uuid )
{
emit clipSelected( uuid );
}
void ImportMediaListController::clipDeletion( const QUuid& uuid )
{
m_clipDeleted += 1;
emit clipDeleted( uuid );
}
void ImportMediaListController::mediaDeletion( const QUuid& uuid )
{
emit mediaDeleted( uuid );
}
void ImportMediaListController::clipAdded( Clip* clip )
{
if ( clip->getParent() == 0 )
......
......@@ -57,10 +57,7 @@ class ImportMediaListController : public ListViewController
public slots:
void metaDataComputed( Media* media );
void clipSelection( const QUuid& uuid );
void mediaSelection( const QUuid& uuid );
void clipDeletion( const QUuid& uuid );
void mediaDeletion( const QUuid& uuid );
void clipAdded( Clip* clip );
signals:
......
......@@ -43,7 +43,7 @@ StackViewController::StackViewController( QWidget* parent, bool enableImport ) :
{
m_importButton = new QPushButton( "Import", parent );
m_layout->addWidget( m_importButton );
connect( m_importButton, SIGNAL( clicked() ), this, SLOT( displayImportMenu() ) );
connect( m_importButton, SIGNAL( clicked() ), this, SIGNAL( importRequired() ) );
}
parent->setLayout( m_layout );
......@@ -114,7 +114,3 @@ const ViewController* StackViewController::getCurrentViewController() const
return m_current;
}
void StackViewController::displayImportMenu()
{
emit importRequired();
}
......@@ -57,7 +57,6 @@ private:
public slots:
void previous();
void displayImportMenu();
signals:
void importRequired();
......
......@@ -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;
......
......@@ -79,7 +79,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()
......@@ -199,10 +199,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->startRender();
m_isRendering = true;
......@@ -425,22 +425,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();
}
......@@ -138,10 +138,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