Commit 0a704488 authored by Hugo Beauzee-Luyssen's avatar Hugo Beauzee-Luyssen

Merge branch 'master' into chouquette_sound_workflow

Conflicts:
	src/EffectsEngine/OutSlot.hpp
	src/GUI/MainWindow.cpp
	src/GUI/ui/MainWindow.ui
	src/LibVLCpp/VLCMedia.cpp
	src/Renderer/WorkflowRenderer.cpp
	src/Renderer/WorkflowRenderer.h
	src/Workflow/ClipWorkflow.cpp
	src/Workflow/ClipWorkflow.h
	src/Workflow/MainWorkflow.cpp
	src/Workflow/MainWorkflow.h
	src/Workflow/TrackWorkflow.cpp
	src/Workflow/TrackWorkflow.h
	vlmc.pro
parents 59c560fb 9899297c
......@@ -111,10 +111,6 @@ OutSlot<T>::~OutSlot()
template<typename T>
OutSlot<T>& OutSlot<T>::operator=( T const & val )
{
qDebug() << "HAIE GALLE sur type T";
qDebug() << "m_pipe : " << this->m_pipe;
qDebug() << "&m_junk : " << &(this->m_junk)
<< "\n" ;
(*m_pipe) = val;
return ( *this );
}
......@@ -122,10 +118,6 @@ OutSlot<T>& OutSlot<T>::operator=( T const & val )
template<typename T>
OutSlot<T>& OutSlot<T>::operator<<( T const & val )
{
qDebug() << "CHEUVEU ROND";
qDebug() << "m_pipe : " << this->m_pipe;
qDebug() << "&m_junk : " << &(this->m_junk)
<< "\n" ;
(*m_pipe) = val;
return (*this);
}
......
......@@ -87,17 +87,21 @@ void LibraryWidget::removeMedia( const QUuid& uuid )
switch( item->getFileType() )
{
case Media::Audio:
this->m_ui.listWidgetAudio->removeItemWidget( item );
m_ui.listWidgetAudio->removeItemWidget( item );
m_ui.listWidgetAudio->unsetSelectedClip();
break;
case Media::Image:
this->m_ui.listWidgetImage->removeItemWidget( item );
m_ui.listWidgetImage->removeItemWidget( item );
m_ui.listWidgetImage->unsetSelectedClip();
break;
case Media::Video:
this->m_ui.listWidgetVideo->removeItemWidget( item );
m_ui.listWidgetVideo->removeItemWidget( item );
m_ui.listWidgetVideo->unsetSelectedClip();
break;
}
m_clips->removeOne( item );
delete item;
return ;
}
}
}
......
......@@ -415,8 +415,8 @@ void MainWindow::on_actionBypass_effects_engine_toggled(bool toggled)
else
ee->disable();
return ;
}
void MainWindow::on_actionProject_Preferences_triggered()
{
m_projectPreferences->show();
......
......@@ -122,3 +122,8 @@ void MediaListWidget::paintEvent( QPaintEvent* event )
}
QListWidget::paintEvent( event );
}
void MediaListWidget::unsetSelectedClip()
{
emit selectedClipChanged( NULL );
}
......@@ -39,6 +39,7 @@ class MediaListWidget : public QListWidget
public:
MediaListWidget( QWidget* parent = 0 );
void setType( Media::FileType fileType );
void unsetSelectedClip();
protected:
virtual void mousePressEvent( QMouseEvent* event );
......
......@@ -51,6 +51,11 @@ ClipRenderer::~ClipRenderer()
void ClipRenderer::setMedia( Media* media )
{
m_selectedMedia = media;
if ( media == NULL )
{
m_previewLabel->clear();
return ;
}
m_begin = 0;
m_end = media->getNbFrames();
if ( m_isRendering == true )
......@@ -65,6 +70,12 @@ void ClipRenderer::setMedia( Media* media )
void ClipRenderer::setClip( Clip* clip )
{
if ( clip == NULL )
{
m_selectedMedia = NULL;
m_previewLabel->clear();
return ;
}
m_selectedMedia = clip->getParent();
m_begin = clip->getBegin();
m_end = clip->getEnd();
......@@ -216,6 +227,8 @@ void ClipRenderer::__endReached()
{
m_mediaPlayer->stop();
m_isRendering = false;
if ( m_mediaChanged == true )
m_clipLoaded = false;
emit endReached();
}
......@@ -36,6 +36,8 @@ ClipWorkflow::ClipWorkflow( Clip::Clip* clip ) :
m_state( ClipWorkflow::Stopped ),
m_fullSpeedRender( false )
{
m_frame = new LightVideoFrame( VIDEOHEIGHT * VIDEOWIDTH * Pixel::NbComposantes );
// m_backBuffer = new unsigned char[VIDEOHEIGHT * VIDEOWIDTH * 4];
m_stateLock = new QReadWriteLock;
m_requiredStateLock = new QMutex;
m_waitCond = new QWaitCondition;
......
......@@ -74,6 +74,11 @@ EffectsEngine* MainWorkflow::getEffectsEngine(void)
return ( m_effectEngine );
}
EffectsEngine* MainWorkflow::getEffectsEngine(void)
{
return ( m_effectEngine );
}
void MainWorkflow::addClip( Clip* clip, unsigned int trackId,
qint64 start, TrackWorkflow::TrackType trackType )
{
......
......@@ -53,6 +53,7 @@ class MainWorkflow : public QObject, public Singleton<MainWorkflow>
void startRender();
void getOutput();
OutputBuffers* getSynchroneOutput();
EffectsEngine* getEffectsEngine( void );
/**
* \brief Set the workflow position
......@@ -142,6 +143,8 @@ class MainWorkflow : public QObject, public Singleton<MainWorkflow>
friend class Singleton<MainWorkflow>;
EffectsEngine* m_effectEngine;
private slots:
void tracksPaused();
void tracksRenderCompleted();
......
......@@ -166,6 +166,7 @@ INCLUDEPATH += src/LibVLCpp \
src/Library \
src/Media \
src/Project \
src/EffectsEngine \
src/Configuration \
src/EffectsEngine \
src
......
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