Commit 05fd441b authored by Hugo Beauzee-Luyssen's avatar Hugo Beauzee-Luyssen

Changed some slots/signals name for more clarity.

parent c20c851f
......@@ -151,7 +151,7 @@ void ClipWorkflow::initialize( LibVLCpp::MediaPlayer* mediaPlayer )
m_mediaPlayer->setMedia( m_clip->getParent()->getVLCMedia() );
connect( m_mediaPlayer, SIGNAL( playing() ), this, SLOT( setPositionAfterPlayback() ), Qt::DirectConnection );
connect( m_mediaPlayer, SIGNAL( endReached() ), this, SLOT( endReached() ), Qt::DirectConnection );
connect( m_mediaPlayer, SIGNAL( endReached() ), this, SLOT( clipEndReached() ), Qt::DirectConnection );
m_mediaPlayer->play();
}
......@@ -209,7 +209,7 @@ void ClipWorkflow::startRender()
setState( Rendering );
}
void ClipWorkflow::endReached()
void ClipWorkflow::clipEndReached()
{
setState( EndReached );
}
......@@ -223,6 +223,7 @@ void ClipWorkflow::stop()
{
Q_ASSERT( m_mediaPlayer != NULL );
m_mediaPlayer->stop();
disconnect( m_mediaPlayer, SIGNAL( endReached() ), this, SLOT( clipEndReached() ) );
m_mediaPlayer = NULL;
setState( Stopped );
QMutexLocker lock( m_requiredStateLock );
......
......@@ -178,11 +178,13 @@ class ClipWorkflow : public QObject
QMutex* m_requiredStateLock;
public slots:
private slots:
void pauseAfterPlaybackStarted();
void pausedMediaPlayer();
void setPositionAfterPlayback();
void endReached();
public slots:
void clipEndReached();
};
#endif // CLIPWORKFLOW_H
......@@ -77,7 +77,7 @@ class TrackWorkflow : public QObject
void addClip( Clip*, qint64 start );
signals:
void endReached();
void trackEndReached();
};
#endif // TRACKWORKFLOW_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