Commit 8bffbf86 authored by Hugo Beauzee-Luyssen's avatar Hugo Beauzee-Luyssen

Restored signal/slots connection with the new names.

parent 4c4e1b46
......@@ -12,7 +12,7 @@
MetaDataManager::MetaDataManager() : m_renderWidget( NULL )
{
m_mediaPlayer = new LibVLCpp::MediaPlayer();
connect( Library::getInstance(), SIGNAL( newClipLoaded( Clip* ) ),this, SLOT( newClipLoaded( Clip* ) ) );
connect( Library::getInstance(), SIGNAL( newMediaLoaded( Media* ) ),this, SLOT( newMediaLoaded( Media* ) ) );
m_tmpSnapshotFilename = new char[512];
m_renderWidget = new QWidget();
m_mediaPlayer->setDrawable( m_renderWidget->winId() );
......
......@@ -72,7 +72,7 @@ ListViewMediaItem* LibraryWidget::addMedia( const Media* media, Library::FileTy
return item;
}
void LibraryWidget::clipRemoved( const QUuid& uuid )
void LibraryWidget::mediaRemoved( const QUuid& uuid )
{
removeMedia( uuid );
}
......@@ -135,7 +135,7 @@ void LibraryWidget::insertNewMediasFromFileDialog( QString title, QString fil
{
// item = insertNewMedia( fileName, filetype );
// if( fileType == Library::Video )
emit newClipLoadingAsked( filePath );
emit newMediaLoadingAsked( filePath );
}
// if ( item != NULL )
// settings.setValue( "mediaLibraryDialogPath" , item->getClip()->getFileInfo()->absoluteDir().absolutePath() );
......@@ -171,7 +171,7 @@ void LibraryWidget::on_pushButtonRemoveMedia_clicked()
ListViewMediaItem* item = ( ListViewMediaItem* ) mediaList->currentItem();
if ( !item ) return;
// removeMedia( item );
emit removingClipAsked( item->getMedia()->getUuid() );
emit removingMediaAsked( item->getMedia()->getUuid() );
}
void LibraryWidget::changeEvent( QEvent *e )
......
......@@ -65,7 +65,7 @@ private:
public slots:
void newMediaLoaded( Media* );
void clipRemoved( const QUuid& );
void mediaRemoved( const QUuid& );
private slots:
void on_pushButtonAddMedia_clicked();
......@@ -73,8 +73,8 @@ private slots:
signals:
// void listViewMediaAdded(Clip* clip);
void newClipLoadingAsked( const QString& );
void removingClipAsked( const QUuid& );
void newMediaLoadingAsked( const QString& );
void removingMediaAsked( const QUuid& );
};
#endif /* !LIBRARYWIDGET_H */
......@@ -90,24 +90,24 @@ void MainWindow::setupLibrary()
//Connecting GUI and Frontend :
connect( libraryWidget,
SIGNAL( newClipLoadingAsked(const QString& ) ),
SIGNAL( newMediaLoadingAsked(const QString& ) ),
library,
SLOT( newClipLoadingAsked( const QString& ) ) );
SLOT( newMediaLoadingAsked( const QString& ) ) );
connect( library,
SIGNAL( newClipLoaded( Clip* ) ),
SIGNAL( newMediaLoaded( Media* ) ),
libraryWidget,
SLOT( newClipLoaded( Clip* ) ) );
SLOT( newMediaLoaded( Media* ) ) );
connect( libraryWidget,
SIGNAL( removingClipAsked( const QUuid& ) ),
SIGNAL( removingMediaAsked( const QUuid& ) ),
library,
SLOT( removingClipAsked( const QUuid& ) ) );
SLOT( removingMediaAsked( const QUuid& ) ) );
connect( library,
SIGNAL( clipRemoved( const QUuid& ) ),
SIGNAL( mediaRemoved( const QUuid& ) ),
libraryWidget,
SLOT( clipRemoved( const QUuid& ) ) );
SLOT( mediaRemoved( const QUuid& ) ) );
}
void MainWindow::createStatusBar()
......
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