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

Cosmetic & comments

parent c74b3ca2
......@@ -73,6 +73,7 @@ private slots:
signals:
void clipSelected( Clip* );
/// Used when the user clicks the deletion arrow.
void clipRemoved( const QUuid& );
};
#endif // MEDIALISTVIEW_H
......@@ -160,6 +160,7 @@ MediaContainer::deleteClip( const QUuid &uuid )
Clip* clip = it.value();
m_clips.remove( uuid );
emit clipRemoved( uuid );
// don't use delete as the clip may be used in the slot that'll handle clipRemoved signal.
clip->deleteLater();
}
}
......
......@@ -46,7 +46,7 @@ ClipRenderer::ClipRenderer() :
connect( m_mediaPlayer, SIGNAL( paused() ), this, SIGNAL( paused() ) );
connect( m_mediaPlayer, SIGNAL( playing() ), this, SIGNAL( playing() ) );
connect( m_mediaPlayer, SIGNAL( volumeChanged() ), this, SIGNAL( volumeChanged() ) );
connect( m_mediaPlayer, SIGNAL( timeChanged( qint64 ) ), this, SLOT( __timeChanged( qint64 ) ) );
connect( m_mediaPlayer, SIGNAL( timeChanged( qint64 ) ),this, SLOT( __timeChanged( qint64 ) ) );
connect( m_mediaPlayer, SIGNAL( endReached() ), this, SLOT( __endReached() ) );
}
......@@ -60,7 +60,6 @@ ClipRenderer::~ClipRenderer()
void
ClipRenderer::setClip( Clip* clip )
{
if ( m_selectedClip != NULL && clip != NULL &&
clip->uuid() != m_selectedClip->uuid() )
clipUnloaded( m_selectedClip->uuid() );
......
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