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

Removed useless flag and useless method

parent b85c2f1b
......@@ -115,13 +115,13 @@ WorkflowRenderer::lock( void *datas, qint64 *dts, qint64 *pts, quint32 *flags,
{
ret = handler->self->lockVideo( pts, bufferSize, buffer );
if ( paused == false )
handler->self->m_mainWorkflow->goToNextFrame( MainWorkflow::VideoTrack );
handler->self->m_mainWorkflow->nextFrame( MainWorkflow::VideoTrack );
}
else if ( handler->type == Audio )
{
ret = handler->self->lockAudio( pts, bufferSize, buffer );
if ( paused == false )
handler->self->m_mainWorkflow->goToNextFrame( MainWorkflow::AudioTrack );
handler->self->m_mainWorkflow->nextFrame( MainWorkflow::AudioTrack );
}
else
qCritical() << "Invalid ES type";
......
......@@ -122,7 +122,6 @@ void
MainWorkflow::startRender()
{
m_renderStarted = true;
m_paused = false;
for ( unsigned int i = 0; i < MainWorkflow::NbTrackType; ++i )
m_tracks[i]->startRender();
computeLength();
......@@ -171,13 +170,6 @@ MainWorkflow::unpause()
emit mainWorkflowUnpaused();
}
void
MainWorkflow::goToNextFrame( MainWorkflow::TrackType trackType )
{
if ( m_paused == false )
nextFrame( trackType );
}
void
MainWorkflow::nextFrame( MainWorkflow::TrackType trackType )
{
......
......@@ -126,21 +126,6 @@ class MainWorkflow : public QObject, public Singleton<MainWorkflow>
*/
EffectsEngine* getEffectsEngine();
/**
* \brief This method is meant to make the workflow go to the next
* frame, only in rendering mode.
*
* The nextFrame() method will always go for the next frame, whereas this one
* only does when rendering isn't paused.
* \param trackType The type of the frame counter to increment.
* Though it seems odd to speak about frame for
* AudioTrack, it's mainly a render position used for
* synchronisation purpose.
* \sa nextFrame( MainWorkflow::TrackType )
* \todo check if this is still usefull.
*/
void goToNextFrame( MainWorkflow::TrackType trackype );
/**
* \brief Set the workflow position by the desired frame
* \param currentFrame: The desired frame to render from
......@@ -195,7 +180,6 @@ class MainWorkflow : public QObject, public Singleton<MainWorkflow>
* Though it seems odd to speak about frame for AudioTrack,
* it's mainly a render position used for
* synchronisation purpose.
* \sa goToNextFrame( MainWorkflow::TrackType )
* \sa previousFrame( MainWorkflow::TrackType );
*/
void nextFrame( TrackType trackType );
......@@ -377,8 +361,6 @@ class MainWorkflow : public QObject, public Singleton<MainWorkflow>
bool m_renderStarted;
QReadWriteLock* m_renderStartedLock;
/// True if the workflow is paused
bool m_paused;
/// Contains the trackhandler, indexed by MainWorkflow::TrackType
TrackHandler** m_tracks;
/// Pre-allocated buffer, that will contain every computed outputs.
......
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