Commit e13fcab7 authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen

Fixing ceff8337 refactoring.

It caused the application to hang on exit.
parent 40307710
......@@ -48,7 +48,7 @@ class EffectUser : public QObject
protected:
EffectUser();
~EffectUser();
virtual ~EffectUser();
void initFilters();
void initMixers();
......
......@@ -46,8 +46,6 @@ WorkflowRenderer::WorkflowRenderer() :
m_media( NULL ),
m_stopping( false ),
m_outputFps( 0.0f ),
m_width( 0 ),
m_height( 0 ),
m_silencedAudioBuffer( NULL ),
m_esHandler( NULL ),
m_oldLength( 0 ),
......
......@@ -261,8 +261,6 @@ class WorkflowRenderer : public GenericRenderer
*/
qint64 m_pts;
qint64 m_audioPts;
quint32 m_width;
quint32 m_height;
private:
/**
......@@ -279,8 +277,6 @@ class WorkflowRenderer : public GenericRenderer
*/
qint64 m_oldLength;
EffectsEngine::EffectList m_filters;
quint32 *m_effectFrame;
static const quint8 VideoCookie = '0';
......
......@@ -50,7 +50,6 @@ TrackWorkflow::TrackWorkflow( Workflow::TrackType type, quint32 trackId ) :
m_renderOneFrameMutex = new QMutex;
m_clipsLock = new QReadWriteLock;
m_mixerBuffer = new Workflow::Frame;
m_effectsLock = new QReadWriteLock;
}
TrackWorkflow::~TrackWorkflow()
......@@ -64,7 +63,6 @@ TrackWorkflow::~TrackWorkflow()
delete it.value();
it = m_clips.erase( it );
}
delete m_effectsLock;
delete m_clipsLock;
delete m_renderOneFrameMutex;
}
......
......@@ -44,9 +44,7 @@ VideoClipWorkflow::VideoClipWorkflow( ClipHelper *ch ) :
VideoClipWorkflow::~VideoClipWorkflow()
{
stop();
qDeleteAll( m_filters );
delete m_renderedFrameMutex;
delete m_effectsLock;
}
void
......
......@@ -63,11 +63,9 @@ class VideoClipWorkflow : public ClipWorkflow
static void unlock( VideoClipWorkflow* clipWorkflow, void* buffer,
int width, int height, int bpp, int size,
qint64 pts );
QReadWriteLock *m_effectsLock;
QMutex *m_renderedFrameMutex;
qint64 m_renderedFrame;
Workflow::Frame *m_lastReturnedBuffer;
EffectsEngine::EffectList m_filters;
};
#endif // VIDEOCLIPWORKFLOW_H
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