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