Cleanup dvgrab group capture

svn path=/trunk/kdenlive/; revision=5948

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 594e1b09ae86dc6f8805026afa1b3ad9496e01d6..11c42b57fd2b75feb93f6d9c8a60e5e08bbb54b3 100644 (file)
--- 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 4aab6269cd128b61c5c790852b85e7104bc8a023..7bec3fc84af0d01e043fa3fb8adf270192f0e9ea 100644 (file)
--- 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 <DocClipBase *>cliplist, QMap<QString, QString> commonproperties);
     void slotActivateEffectStackView(ClipItem* item = NULL, int ix = -1, bool raise = true);

diff --git a/src/recmonitor.cpp b/src/recmonitor.cpp
index 6330474c6a5508329b7b8990f9e3a05dd4310569..a2b8906ab09d9e24079a1557720f4059a026b0a0 100644 (file)
--- 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 12056d7a8af5134d6ba4bc60f2607110a9dde890..fe1d90fb2fb0bd3611ebcc83fcabbf232ae7b574 100644 (file)
--- 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);
 };