From: Jean-Baptiste Mardelle Date: Fri, 7 Oct 2011 10:59:07 +0000 (+0000) Subject: Cleanup dvgrab group capture X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=ac5d3eab48d8e4e7fea4c946b3a6d0d38bd75572;p=kdenlive Cleanup dvgrab group capture svn path=/trunk/kdenlive/; revision=5948 --- diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 594e1b09..11c42b57 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -218,6 +218,7 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, const QString & m_recMonitor = new RecMonitor("record", m_monitorManager); m_recMonitorDock->setWidget(m_recMonitor); connect(m_recMonitor, SIGNAL(addProjectClip(KUrl)), this, SLOT(slotAddProjectClip(KUrl))); + connect(m_recMonitor, SIGNAL(addProjectClipList(KUrl::List)), this, SLOT(slotAddProjectClipList(KUrl::List))); connect(m_recMonitor, SIGNAL(showConfigDialog(int, int)), this, SLOT(slotPreferences(int, int))); #endif m_monitorManager->initMonitors(m_clipMonitor, m_projectMonitor, m_recMonitor); @@ -2996,6 +2997,12 @@ void MainWindow::slotAddProjectClip(KUrl url) m_activeDocument->slotAddClipFile(url, QString()); } +void MainWindow::slotAddProjectClipList(KUrl::List urls) +{ + if (m_activeDocument) + m_activeDocument->slotAddClipList(urls, QString()); +} + void MainWindow::slotAddTransition(QAction *result) { if (!result) return; diff --git a/src/mainwindow.h b/src/mainwindow.h index 4aab6269..7bec3fc8 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -411,6 +411,7 @@ private slots: void slotAddVideoEffect(QAction *result); void slotAddTransition(QAction *result); void slotAddProjectClip(KUrl url); + void slotAddProjectClipList(KUrl::List urls); void slotShowClipProperties(DocClipBase *clip); void slotShowClipProperties(QList cliplist, QMap commonproperties); void slotActivateEffectStackView(ClipItem* item = NULL, int ix = -1, bool raise = true); diff --git a/src/recmonitor.cpp b/src/recmonitor.cpp index 6330474c..a2b8906a 100644 --- a/src/recmonitor.cpp +++ b/src/recmonitor.cpp @@ -851,10 +851,7 @@ void RecMonitor::manageCapturedFiles() if (capturedFiles.count() > 0) { ManageCapturesDialog *d = new ManageCapturesDialog(capturedFiles, this); if (d->exec() == QDialog::Accepted) { - capturedFiles = d->importFiles(); - foreach(const KUrl & url, capturedFiles) { - emit addProjectClip(url); - } + emit addProjectClipList(d->importFiles()); } delete d; } diff --git a/src/recmonitor.h b/src/recmonitor.h index 12056d7a..fe1d90fb 100644 --- a/src/recmonitor.h +++ b/src/recmonitor.h @@ -139,6 +139,7 @@ signals: void renderPosition(int); void durationChanged(int); void addProjectClip(KUrl); + void addProjectClipList(KUrl::List); void showConfigDialog(int, int); };