]> git.sesse.net Git - kdenlive/blobdiff - src/recmonitor.cpp
Cleaning code style of Definitions.
[kdenlive] / src / recmonitor.cpp
index 84a7ecf728e3a5eb6f5916bb24556e9e4f456f6b..e66a8f1572378476d6ca443285c4a25a2ef7b8ca 100644 (file)
 
 #include "recmonitor.h"
 #include "gentime.h"
+#include "mltdevicecapture.h"
 #include "kdenlivesettings.h"
 #include "managecapturesdialog.h"
+#include "monitormanager.h"
+#include "monitor.h"
+#include "profilesdialog.h"
 
 #include <KDebug>
-#include <KLocale>
-#include <QPainter>
+#include <KLocalizedString>
 #include <KStandardDirs>
 #include <KComboBox>
 #include <KIO/NetAccess>
 #include <KFileItem>
 #include <KMessageBox>
-
-#if KDE_IS_VERSION(4,2,0)
+#include <KApplication>
 #include <KDiskFreeSpaceInfo>
-#endif
 
 #include <QMouseEvent>
 #include <QMenu>
 #include <QToolButton>
 #include <QFile>
 #include <QDir>
+#include <QDesktopWidget>
 
 
-RecMonitor::RecMonitor(QString name, QWidget *parent) :
-        QWidget(parent),
-        m_name(name),
-        m_isActive(false),
-        m_isCapturing(false),
-        m_didCapture(false),
-        m_isPlaying(false)
+RecMonitor::RecMonitor(Kdenlive::MonitorId name, MonitorManager *manager, QWidget *parent) :
+    AbstractMonitor(name, manager, parent),
+    m_isCapturing(false),
+    m_didCapture(false),
+    m_isPlaying(false),
+    m_captureDevice(NULL),
+    m_analyse(false)
 {
     setupUi(this);
 
-    video_frame->setAttribute(Qt::WA_PaintOnScreen);
+    //video_frame->setAttribute(Qt::WA_PaintOnScreen);
     device_selector->setCurrentIndex(KdenliveSettings::defaultcapture());
     connect(device_selector, SIGNAL(currentIndexChanged(int)), this, SLOT(slotVideoDeviceChanged(int)));
-
-
-
-    QToolBar *toolbar = new QToolBar(name, this);
-    QHBoxLayout *layout = new QHBoxLayout;
-    layout->setContentsMargins(0, 0, 0, 0);
+    // Video widget holder
+    QVBoxLayout *l = new QVBoxLayout;
+    l->setContentsMargins(0, 0, 0, 0);
+    l->setSpacing(0);
+    l->addWidget(videoBox, 10);
+    video_frame->setLayout(l);
+    createVideoSurface();
+
+    QToolBar *toolbar = new QToolBar(this);
+    QHBoxLayout *hlayout = new QHBoxLayout;
+    hlayout->setContentsMargins(0, 0, 0, 0);
     m_playIcon = KIcon("media-playback-start");
     m_pauseIcon = KIcon("media-playback-pause");
 
@@ -72,7 +79,7 @@ RecMonitor::RecMonitor(QString name, QWidget *parent) :
     connect(m_rewAction, SIGNAL(triggered()), this, SLOT(slotRewind()));
 
     m_playAction = toolbar->addAction(m_playIcon, i18n("Play"));
-    connect(m_playAction, SIGNAL(triggered()), this, SLOT(slotStartCapture()));
+    connect(m_playAction, SIGNAL(triggered()), this, SLOT(slotStartPreview()));
 
     m_stopAction = toolbar->addAction(KIcon("media-playback-stop"), i18n("Stop"));
     connect(m_stopAction, SIGNAL(triggered()), this, SLOT(slotStopCapture()));
@@ -84,74 +91,122 @@ RecMonitor::RecMonitor(QString name, QWidget *parent) :
     connect(m_recAction, SIGNAL(triggered()), this, SLOT(slotRecord()));
     m_recAction->setCheckable(true);
 
+    rec_options->setIcon(KIcon("system-run"));
+    QMenu *menu = new QMenu(this);
+    m_addCapturedClip = new QAction(i18n("Add Captured File to Project"), this);
+    m_addCapturedClip->setCheckable(true);
+    m_addCapturedClip->setChecked(true);
+    menu->addAction(m_addCapturedClip);
+
+    rec_audio->setChecked(KdenliveSettings::v4l_captureaudio());
+    rec_video->setChecked(KdenliveSettings::v4l_capturevideo());
+
+    m_previewSettings = new QAction(i18n("Recording Preview"), this);
+    m_previewSettings->setCheckable(true);
+
+    rec_options->setMenu(menu);
+    menu->addAction(m_previewSettings);
+
     toolbar->addSeparator();
 
     QAction *configAction = toolbar->addAction(KIcon("configure"), i18n("Configure"));
     connect(configAction, SIGNAL(triggered()), this, SLOT(slotConfigure()));
     configAction->setCheckable(false);
 
-    layout->addWidget(toolbar);
-
-    layout->addWidget(&m_dvinfo);
-
-#if KDE_IS_VERSION(4,2,0)
+    hlayout->addWidget(toolbar);
+    hlayout->addWidget(&m_logger);
+    hlayout->addWidget(&m_dvinfo);
+    m_logger.setMaxCount(10);
+    m_logger.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+    m_logger.setFrame(false);
+    //m_logger.setInsertPolicy(QComboBox::InsertAtTop);
+    
     m_freeSpace = new KCapacityBar(KCapacityBar::DrawTextInline, this);
     m_freeSpace->setMaximumWidth(150);
     QFontMetricsF fontMetrics(font());
     m_freeSpace->setMaximumHeight(fontMetrics.height() * 1.2);
     slotUpdateFreeSpace();
-    layout->addWidget(m_freeSpace);
+    hlayout->addWidget(m_freeSpace);
     connect(&m_spaceTimer, SIGNAL(timeout()), this, SLOT(slotUpdateFreeSpace()));
     m_spaceTimer.setInterval(30000);
     m_spaceTimer.setSingleShot(false);
-#endif
 
-    control_frame_firewire->setLayout(layout);
-
-    slotVideoDeviceChanged(device_selector->currentIndex());
+    control_frame_firewire->setLayout(hlayout);
     m_displayProcess = new QProcess;
     m_captureProcess = new QProcess;
 
     connect(m_captureProcess, SIGNAL(stateChanged(QProcess::ProcessState)), this, SLOT(slotProcessStatus(QProcess::ProcessState)));
-    connect(m_captureProcess, SIGNAL(readyReadStandardError()), this, SLOT(slotReadDvgrabInfo()));
-
-    QStringList env = QProcess::systemEnvironment();
-    env << "SDL_WINDOWID=" + QString::number(video_frame->winId());
-
+    connect(m_captureProcess, SIGNAL(readyReadStandardError()), this, SLOT(slotReadProcessInfo()));
+    
     QString videoDriver = KdenliveSettings::videodrivername();
+#if QT_VERSION >= 0x040600
+    QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+    env.insert("SDL_WINDOWID", QString::number(videoSurface->winId()));
+    if (!videoDriver.isEmpty()) {
+        if (videoDriver == "x11_noaccel") {
+            env.insert("SDL_VIDEO_YUV_HWACCEL", "0");
+            env.insert("SDL_VIDEODRIVER", "x11");
+        } else env.insert("SDL_VIDEODRIVER", videoDriver);
+    }
+    m_displayProcess->setProcessEnvironment(env);
+#else
+    QStringList env = QProcess::systemEnvironment();
+    env << "SDL_WINDOWID=" + QString::number(videoSurface->winId());
     if (!videoDriver.isEmpty()) {
         if (videoDriver == "x11_noaccel") {
             env << "SDL_VIDEO_YUV_HWACCEL=0";
             env << "SDL_VIDEODRIVER=x11";
         } else env << "SDL_VIDEODRIVER=" + videoDriver;
     }
-    setenv("SDL_VIDEO_ALLOW_SCREENSAVER", "1", 1);
-
     m_displayProcess->setEnvironment(env);
+#endif
 
-    if (KdenliveSettings::video4capture().isEmpty()) {
-        QString captureCommand;
-        if (!KdenliveSettings::video4adevice().isEmpty()) captureCommand = "-f " + KdenliveSettings::video4aformat() + " -i " + KdenliveSettings::video4adevice();
-
-        captureCommand +=  " -f " + KdenliveSettings::video4vformat() + " -s " + KdenliveSettings::video4size() + " -r " + QString::number(KdenliveSettings::video4rate()) + " -i " + KdenliveSettings::video4vdevice();
-        KdenliveSettings::setVideo4capture(captureCommand);
-    }
+    setenv("SDL_VIDEO_ALLOW_SCREENSAVER", "1", 1);
 
-    kDebug() << "/////// BUILDING MONITOR, ID: " << video_frame->winId();
+    kDebug() << "/////// BUILDING MONITOR, ID: " << videoSurface->winId();
+#if KDE_IS_VERSION(4,7,0)
+    m_infoMessage = new KMessageWidget;
+    QVBoxLayout *s =  static_cast <QVBoxLayout *> (layout());
+    s->insertWidget(1, m_infoMessage);
+    m_infoMessage->hide();
+#endif
+    
+    slotVideoDeviceChanged(device_selector->currentIndex());
+    m_previewSettings->setChecked(KdenliveSettings::enable_recording_preview());
+    connect(m_previewSettings, SIGNAL(triggered(bool)), this, SLOT(slotChangeRecordingPreview(bool)));
 }
 
 RecMonitor::~RecMonitor()
 {
-#if KDE_IS_VERSION(4,2,0)
     m_spaceTimer.stop();
-#endif
     delete m_captureProcess;
     delete m_displayProcess;
+    delete m_captureDevice;
+}
+
+void RecMonitor::mouseDoubleClickEvent(QMouseEvent * event)
+{
+    if (!KdenliveSettings::openglmonitors() && videoBox && videoBox->isVisible()) {
+        videoBox->switchFullScreen();
+        event->accept();
+    }
 }
 
-QString RecMonitor::name() const
+void RecMonitor::slotSwitchFullScreen()
 {
-    return m_name;
+    videoBox->switchFullScreen();
+}
+
+void RecMonitor::stop()
+{
+    // Special case: when recording audio only, do not stop so that we can do voiceover.
+    if (device_selector->currentIndex() == SCREENGRAB || (device_selector->currentIndex() == VIDEO4LINUX && !rec_video->isChecked())) return;
+    slotStopCapture();
+}
+
+void RecMonitor::start()
+{
+    //slotStartPreview(true);
 }
 
 void RecMonitor::slotConfigure()
@@ -159,52 +214,97 @@ void RecMonitor::slotConfigure()
     emit showConfigDialog(4, device_selector->currentIndex());
 }
 
-void RecMonitor::slotUpdateCaptureFolder()
+void RecMonitor::slotUpdateCaptureFolder(const QString &currentProjectFolder)
 {
-    if (m_captureProcess) m_captureProcess->setWorkingDirectory(KdenliveSettings::capturefolder());
+    if (KdenliveSettings::capturetoprojectfolder()) m_capturePath = currentProjectFolder;
+    else m_capturePath = KdenliveSettings::capturefolder();
+    if (m_captureProcess) m_captureProcess->setWorkingDirectory(m_capturePath);
     if (m_captureProcess->state() != QProcess::NotRunning) {
         if (device_selector->currentIndex() == FIREWIRE)
             KMessageBox::information(this, i18n("You need to disconnect and reconnect in the capture monitor to apply your changes"), i18n("Capturing"));
         else KMessageBox::information(this, i18n("You need to stop capture before your changes can be applied"), i18n("Capturing"));
     } else slotVideoDeviceChanged(device_selector->currentIndex());
-    kDebug() << "// UPDATE CAPT FOLD: " << KdenliveSettings::capturefolder();
 
-#if KDE_IS_VERSION(4,2,0)
     // update free space info
     slotUpdateFreeSpace();
-#endif
 }
 
 void RecMonitor::slotVideoDeviceChanged(int ix)
 {
+    QString capturefile;
+    QString capturename;
+#if KDE_IS_VERSION(4,7,0)
+    if (m_infoMessage->isVisible()) {
+#if KDE_IS_VERSION(4,10,0)
+       m_infoMessage->animatedHide();
+#else    
+       QTimer::singleShot(0, m_infoMessage, SLOT(animatedHide()));
+#endif
+    }
+#endif
+    m_previewSettings->setEnabled(ix == VIDEO4LINUX || ix == BLACKMAGIC);
+    control_frame->setVisible(ix == VIDEO4LINUX);
+    m_playAction->setVisible(ix != SCREENGRAB);
+    m_fwdAction->setVisible(ix == FIREWIRE);
+    m_discAction->setVisible(ix == FIREWIRE);
+    m_rewAction->setVisible(ix == FIREWIRE);
+    m_recAction->setEnabled(ix != FIREWIRE);
+    m_logger.setVisible(ix == BLACKMAGIC);
+    if (m_captureDevice) {
+        // MLT capture still running, abort
+        m_monitorManager->clearScopeSource();
+        m_captureDevice->stop();
+        delete m_captureDevice;
+        m_captureDevice = NULL;
+    }
+
+    // The m_videoBox container has to be shown once before the MLT consumer is build, or preview will fail
+    videoBox->setHidden(ix != VIDEO4LINUX && ix != BLACKMAGIC);
+    videoBox->setHidden(true);
     switch (ix) {
     case SCREENGRAB:
         m_discAction->setEnabled(false);
         m_rewAction->setEnabled(false);
         m_fwdAction->setEnabled(false);
-        m_recAction->setEnabled(true);
         m_stopAction->setEnabled(false);
         m_playAction->setEnabled(false);
-        if (KdenliveSettings::rmd_path().isEmpty()) {
-            QString rmdpath = KStandardDirs::findExe("recordmydesktop");
-            if (rmdpath.isEmpty()) video_frame->setPixmap(mergeSideBySide(KIcon("dialog-warning").pixmap(QSize(50, 50)), i18n("Recordmydesktop utility not found,\n please install it for screen grabs")));
-            else KdenliveSettings::setRmd_path(rmdpath);
-        }
-        if (!KdenliveSettings::rmd_path().isEmpty()) video_frame->setPixmap(mergeSideBySide(KIcon("video-display").pixmap(QSize(50, 50)), i18n("Press record button\nto start screen capture\nFiles will be saved in:\n%1", KdenliveSettings::capturefolder())));
+       if (KdenliveSettings::ffmpegpath().isEmpty()) {
+           QString exepath = KStandardDirs::findExe("ffmpeg");
+           if (exepath.isEmpty()) {
+               // Check for libav version
+               exepath = KStandardDirs::findExe("avconv");
+           }
+           if (exepath.isEmpty()) showWarningMessage(i18n("ffmpeg or avconv not found,\n please install it for screen grabs"));
+           else KdenliveSettings::setFfmpegpath(exepath);
+       }
+        if (!KdenliveSettings::ffmpegpath().isEmpty()) {
+           if (!Render::checkX11Grab()) {
+               // FFmpeg does not support screen grab
+               showWarningMessage(i18n("Your FFmpeg / Libav installation\n does not support screen grab"));
+               m_recAction->setEnabled(false);
+           }
+           else video_frame->setPixmap(mergeSideBySide(KIcon("video-display").pixmap(QSize(50, 50)), i18n("Press record button\nto start screen capture\nFiles will be saved in:\n%1", m_capturePath)));
+       }
         //video_frame->setText(i18n("Press record button\nto start screen capture"));
         break;
     case VIDEO4LINUX:
-        m_discAction->setEnabled(false);
-        m_rewAction->setEnabled(false);
-        m_fwdAction->setEnabled(false);
-        m_recAction->setEnabled(true);
         m_stopAction->setEnabled(false);
         m_playAction->setEnabled(true);
         checkDeviceAvailability();
         break;
+    case BLACKMAGIC:
+        m_stopAction->setEnabled(false);
+        m_playAction->setEnabled(true);
+        capturefile = m_capturePath;
+        if (!capturefile.endsWith('/')) capturefile.append('/');
+        capturename = KdenliveSettings::decklink_filename();
+        capturename.append("xxx.");
+        capturename.append(KdenliveSettings::decklink_extension());
+        capturefile.append(capturename);
+        video_frame->setPixmap(mergeSideBySide(KIcon("camera-photo").pixmap(QSize(50, 50)), i18n("Plug your camcorder and\npress play button\nto start preview.\nFiles will be saved in:\n%1", capturefile)));
+        break;
     default: // FIREWIRE
         m_discAction->setEnabled(true);
-        m_recAction->setEnabled(false);
         m_stopAction->setEnabled(false);
         m_playAction->setEnabled(false);
         m_rewAction->setEnabled(false);
@@ -213,13 +313,15 @@ void RecMonitor::slotVideoDeviceChanged(int ix)
         // Check that dvgab is available
         if (KdenliveSettings::dvgrab_path().isEmpty()) {
             QString dvgrabpath = KStandardDirs::findExe("dvgrab");
-            if (dvgrabpath.isEmpty()) video_frame->setPixmap(mergeSideBySide(KIcon("dialog-warning").pixmap(QSize(50, 50)), i18n("dvgrab utility not found,\n please install it for firewire capture")));
+            if (dvgrabpath.isEmpty()) {
+               showWarningMessage(i18n("dvgrab utility not found,\n please install it for firewire capture"));
+           }
             else KdenliveSettings::setDvgrab_path(dvgrabpath);
         } else {
             // Show capture info
-            QString capturefile = KdenliveSettings::capturefolder();
-            if (!capturefile.endsWith("/")) capturefile.append("/");
-            QString capturename = KdenliveSettings::dvgrabfilename();
+            capturefile = m_capturePath;
+            if (!capturefile.endsWith('/')) capturefile.append('/');
+            capturename = KdenliveSettings::dvgrabfilename();
             if (capturename.isEmpty()) capturename = "capture";
             QString extension;
             switch (KdenliveSettings::firewireformat()) {
@@ -242,7 +344,12 @@ void RecMonitor::slotVideoDeviceChanged(int ix)
     }
 }
 
-QPixmap RecMonitor::mergeSideBySide(const QPixmap& pix, const QString txt)
+void RecMonitor::slotSetInfoMessage(const QString &message)
+{
+    m_logger.insertItem(0, message);
+}
+
+QPixmap RecMonitor::mergeSideBySide(const QPixmap& pix, const QString &txt)
 {
     QPainter p;
     QRect r = QApplication::fontMetrics().boundingRect(QRect(0, 0, video_frame->width(), video_frame->height()), Qt::AlignLeft, txt);
@@ -254,6 +361,7 @@ QPixmap RecMonitor::mergeSideBySide(const QPixmap& pix, const QString txt)
     res.fill(Qt::transparent);
     p.begin(&res);
     p.drawPixmap(0, 0, pix);
+    p.setPen(kapp->palette().text().color());
     p.drawText(QRect(pixWidth + 8, 0, strWidth, strHeight), 0, txt);
     p.end();
     return res;
@@ -263,23 +371,24 @@ QPixmap RecMonitor::mergeSideBySide(const QPixmap& pix, const QString txt)
 void RecMonitor::checkDeviceAvailability()
 {
     if (!KIO::NetAccess::exists(KUrl(KdenliveSettings::video4vdevice()), KIO::NetAccess::SourceSide , this)) {
-        m_playAction->setEnabled(false);
-        m_recAction->setEnabled(false);
+        rec_video->setChecked(false);
+       rec_video->setEnabled(false);
         video_frame->setPixmap(mergeSideBySide(KIcon("camera-web").pixmap(QSize(50, 50)), i18n("Cannot read from device %1\nPlease check drivers and access rights.", KdenliveSettings::video4vdevice())));
-        //video_frame->setText(i18n("Cannot read from device %1\nPlease check drivers and access rights.", KdenliveSettings::video4vdevice()));
-    } else //video_frame->setText(i18n("Press play or record button\nto start video capture"));
-        video_frame->setPixmap(mergeSideBySide(KIcon("camera-web").pixmap(QSize(50, 50)), i18n("Press play or record button\nto start video capture\nFiles will be saved in:\n%1", KdenliveSettings::capturefolder())));
+    } else {
+       rec_video->setEnabled(true);
+        video_frame->setPixmap(mergeSideBySide(KIcon("camera-web").pixmap(QSize(50, 50)), i18n("Press play or record button\nto start video capture\nFiles will be saved in:\n%1", m_capturePath)));
+    }
 }
 
 void RecMonitor::slotDisconnect()
 {
     if (m_captureProcess->state() == QProcess::NotRunning) {
         m_captureTime = KDateTime::currentLocalDateTime();
-        kDebug() << "CURRENT TIME: " << m_captureTime.toString();
+        kDebug() << "CURRENT TIME: " << m_captureTime.toString();       
         m_didCapture = false;
-        slotStartCapture(false);
+        slotStartPreview(false);
         m_discAction->setIcon(KIcon("network-disconnect"));
-        m_discAction->setText(i18n("Disonnect"));
+        m_discAction->setText(i18n("Disconnect"));
         m_recAction->setEnabled(true);
         m_stopAction->setEnabled(true);
         m_playAction->setEnabled(true);
@@ -306,30 +415,49 @@ void RecMonitor::slotForward()
 void RecMonitor::slotStopCapture()
 {
     // stop capture
+    if (!m_isCapturing && !m_isPlaying) return;
+    videoBox->setHidden(true);
+    control_frame->setEnabled(true);
+    slotActivateMonitor();
     switch (device_selector->currentIndex()) {
     case FIREWIRE:
         m_captureProcess->write("\e", 2);
         m_playAction->setIcon(m_playIcon);
         m_isPlaying = false;
-        break;
-    case VIDEO4LINUX:
-        m_captureProcess->write("q\n", 3);
-        QTimer::singleShot(1000, m_captureProcess, SLOT(kill()));
-
         break;
     case SCREENGRAB:
-        m_captureProcess->write("q\n", 3);
-        QTimer::singleShot(1000, m_captureProcess, SLOT(kill()));
+       m_captureProcess->terminate();
+        QTimer::singleShot(1500, m_captureProcess, SLOT(kill()));
+        break;
+    case VIDEO4LINUX:
+    case BLACKMAGIC:
+        if (m_captureDevice) {
+            m_captureDevice->stop();
+        }
+        m_previewSettings->setEnabled(true);
+        m_isCapturing = false;
+        m_isPlaying = false;
+        m_playAction->setEnabled(true);
+        m_stopAction->setEnabled(false);
+        m_recAction->setEnabled(true);
+        slotSetInfoMessage(i18n("Capture stopped"));
+        m_isCapturing = false;
+        m_recAction->setChecked(false);
+        if (m_addCapturedClip->isChecked() && !m_captureFile.isEmpty() && QFile::exists(m_captureFile.path())) {
+            emit addProjectClip(m_captureFile);
+            m_captureFile.clear();
+        }
         break;
     default:
         break;
     }
 }
 
-void RecMonitor::slotStartCapture(bool play)
+void RecMonitor::slotStartPreview(bool play)
 {
     if (m_captureProcess->state() != QProcess::NotRunning) {
         if (device_selector->currentIndex() == FIREWIRE) {
+            videoBox->setHidden(false);
             if (m_isPlaying) {
                 m_captureProcess->write("k", 1);
                 //captureProcess->write("\e", 2);
@@ -343,13 +471,20 @@ void RecMonitor::slotStartCapture(bool play)
         }
         return;
     }
+    slotActivateMonitor();
+    if (m_isPlaying) return;
     m_captureArgs.clear();
     m_displayArgs.clear();
     m_isPlaying = false;
     QString capturename = KdenliveSettings::dvgrabfilename();
-    QStringList dvargs = KdenliveSettings::dvgrabextra().simplified().split(" ", QString::SkipEmptyParts);
-
-    switch (device_selector->currentIndex()) {
+    QString path;
+    MltVideoProfile profile;
+    QString producer;
+    QStringList dvargs = KdenliveSettings::dvgrabextra().simplified().split(' ', QString::SkipEmptyParts);
+    int ix = device_selector->currentIndex();
+    bool isXml;
+    videoBox->setHidden(ix != VIDEO4LINUX && ix != BLACKMAGIC && ix != FIREWIRE);
+    switch (ix) {
     case FIREWIRE:
         switch (KdenliveSettings::firewireformat()) {
         case 0:
@@ -382,10 +517,10 @@ void RecMonitor::slotStartCapture(bool play)
         if (capturename.isEmpty()) capturename = "capture";
         m_captureArgs << capturename << "-";
 
-        m_displayArgs << "-x" << QString::number(video_frame->width()) << "-y" << QString::number(video_frame->height()) << "-";
+        m_displayArgs << "-x" << QString::number(video_frame->width()) << "-y" << QString::number(video_frame->height()) << "-noframedrop" << "-";
 
         m_captureProcess->setStandardOutputProcess(m_displayProcess);
-        m_captureProcess->setWorkingDirectory(KdenliveSettings::capturefolder());
+        m_captureProcess->setWorkingDirectory(m_capturePath);
         kDebug() << "Capture: Running dvgrab " << m_captureArgs.join(" ");
 
         m_captureProcess->start(KdenliveSettings::dvgrab_path(), m_captureArgs);
@@ -393,20 +528,50 @@ void RecMonitor::slotStartCapture(bool play)
         m_discAction->setEnabled(true);
         break;
     case VIDEO4LINUX:
-        m_captureArgs << KdenliveSettings::video4capture().simplified().split(' ') << KdenliveSettings::video4encoding().simplified().split(' ') << "-f" << "mpegts" << "-vcodec" << "mpeg4" << "-acodec" << "mp2" << "-";
-        m_displayArgs << "-f" << "mpegts" << "-x" << QString::number(video_frame->width()) << "-y" << QString::number(video_frame->height()) << "-";
-        m_captureProcess->setStandardOutputProcess(m_displayProcess);
-        kDebug() << "Capture: Running ffmpeg " << m_captureArgs.join(" ");
-        m_captureProcess->start("ffmpeg", m_captureArgs);
+        path = KStandardDirs::locateLocal("appdata", "profiles/video4linux");
+        buildMltDevice(path);
+        profile = ProfilesDialog::getVideoProfile(path);
+        producer = getV4lXmlPlaylist(profile, &isXml);
+
+        //producer = QString("avformat-novalidate:video4linux2:%1?width:%2&height:%3&frame_rate:%4").arg(KdenliveSettings::video4vdevice()).arg(profile.width).arg(profile.height).arg((double) profile.frame_rate_num / profile.frame_rate_den);
+        if (!m_captureDevice->slotStartPreview(producer, isXml)) {
+            // v4l capture failed to start
+            video_frame->setText(i18n("Failed to start Video4Linux,\ncheck your parameters..."));
+            videoBox->setHidden(true);
+
+        } else {
+            m_playAction->setEnabled(false);
+            m_stopAction->setEnabled(true);
+            m_isPlaying = true;
+        }
+
+        break;
+    case BLACKMAGIC:
+        path = KdenliveSettings::current_profile();
+        slotActivateMonitor();
+        buildMltDevice(path);
+        producer = QString("decklink:%1").arg(KdenliveSettings::decklink_capturedevice());
+        if (!m_captureDevice->slotStartPreview(producer)) {
+            // v4l capture failed to start
+            video_frame->setText(i18n("Failed to start Decklink,\ncheck your parameters..."));
+            videoBox->setHidden(true);
+
+        } else {
+            m_playAction->setEnabled(false);
+            m_stopAction->setEnabled(true);
+            m_isPlaying = true;
+        }
         break;
     default:
         break;
     }
 
-    if (device_selector->currentIndex() != SCREENGRAB) {
+    control_frame->setEnabled(false);
+
+    if (device_selector->currentIndex() == FIREWIRE) {
         kDebug() << "Capture: Running ffplay " << m_displayArgs.join(" ");
-        m_displayProcess->start("ffplay", m_displayArgs);
-        video_frame->setText(i18n("Initialising..."));
+        m_displayProcess->start(KdenliveSettings::ffplaypath(), m_displayArgs);
+        //video_frame->setText(i18n("Initialising..."));
     } else {
         // do something when starting screen grab
     }
@@ -414,116 +579,204 @@ void RecMonitor::slotStartCapture(bool play)
 
 void RecMonitor::slotRecord()
 {
+    m_error.clear();
     if (m_captureProcess->state() == QProcess::NotRunning && device_selector->currentIndex() == FIREWIRE) {
-        slotStartCapture();
+        slotStartPreview();
     }
     if (m_isCapturing) {
-        switch (device_selector->currentIndex()) {
-        case FIREWIRE:
-            m_captureProcess->write("\e", 2);
-            m_playAction->setIcon(m_playIcon);
-            m_isCapturing = false;
-            m_isPlaying = false;
-            m_recAction->setChecked(false);
-            break;
-        case VIDEO4LINUX:
-            m_captureProcess->terminate();
-            slotStopCapture();
-            //m_isCapturing = false;
-            QTimer::singleShot(1000, this, SLOT(slotStartCapture()));
-            break;
-        case SCREENGRAB:
-            //captureProcess->write("q\n", 3);
-            m_captureProcess->terminate();
-            video_frame->setText(i18n("Encoding captured video..."));
-            // in case ffmpeg doesn't exit with the 'q' command, kill it one second later
-            //QTimer::singleShot(1000, captureProcess, SLOT(kill()));
-            break;
-        }
+        // User stopped capture
+        slotStopCapture();
         return;
     } else if (device_selector->currentIndex() == FIREWIRE) {
         m_isCapturing = true;
         m_didCapture = true;
         m_captureProcess->write("c\n", 3);
-#if KDE_IS_VERSION(4,2,0)
         m_spaceTimer.start();
-#endif
         return;
     }
     if (m_captureProcess->state() == QProcess::NotRunning) {
+        m_logger.clear();
         m_recAction->setChecked(true);
-        QString extension = "mp4";
-        if (device_selector->currentIndex() == SCREENGRAB) extension = "ogv"; //KdenliveSettings::screengrabextension();
-        QString path = KdenliveSettings::capturefolder() + "/capture0000." + extension;
+        QString extension = "mpg";
+        if (device_selector->currentIndex() == SCREENGRAB) {
+           extension = KdenliveSettings::grab_extension();
+       }
+        else if (device_selector->currentIndex() == VIDEO4LINUX) {
+            // TODO: when recording audio only, allow configuration?
+            if (!rec_video->isChecked()) extension = "wav";
+            else extension = KdenliveSettings::v4l_extension();
+        }
+        else if (device_selector->currentIndex() == BLACKMAGIC) extension = KdenliveSettings::decklink_extension();
+        QString path = KUrl(m_capturePath).path(KUrl::AddTrailingSlash) + "capture0000." + extension;
         int i = 1;
         while (QFile::exists(path)) {
             QString num = QString::number(i).rightJustified(4, '0', false);
-            path = KdenliveSettings::capturefolder() + "/capture" + num + '.' + extension;
-            i++;
+            path = KUrl(m_capturePath).path(KUrl::AddTrailingSlash) + "capture" + num + '.' + extension;
+            ++i;
         }
         m_captureFile = KUrl(path);
 
         m_captureArgs.clear();
         m_displayArgs.clear();
         QString args;
+        QString playlist;
+        QString v4lparameters;
+       QStringList grabParameters;
+        MltVideoProfile profile;
+        bool showPreview;
+       bool isXml;
+       QString captureSize;
+       QRect screenSize = QApplication::desktop()->screenGeometry();
         QString capturename = KdenliveSettings::dvgrabfilename();
         if (capturename.isEmpty()) capturename = "capture";
 
         switch (device_selector->currentIndex()) {
         case VIDEO4LINUX:
-            m_captureArgs << KdenliveSettings::video4capture().simplified().split(' ') << KdenliveSettings::video4encoding().simplified().split(' ') << "-vcodec" << "mpeg4" << "-acodec" << "mp2" << "-y" << m_captureFile.path() << "-f" << "mpegts" << "-vcodec" << "mpeg4" << "-acodec" << "mp2" << "-";
-            m_displayArgs << "-f" << "mpegts" << "-x" << QString::number(video_frame->width()) << "-y" << QString::number(video_frame->height()) << "-";
-            m_captureProcess->setStandardOutputProcess(m_displayProcess);
-            kDebug() << "Capture: Running ffmpeg " << m_captureArgs.join(" ");
-            m_captureProcess->start("ffmpeg", m_captureArgs);
+            if (rec_video->isChecked()) slotActivateMonitor();
+            path = KStandardDirs::locateLocal("appdata", "profiles/video4linux");
+            profile = ProfilesDialog::getVideoProfile(path);
+            //m_videoBox->setRatio((double) profile.display_aspect_num / profile.display_aspect_den);
+            buildMltDevice(path);
+            playlist = getV4lXmlPlaylist(profile, &isXml);
+
+            v4lparameters = KdenliveSettings::v4l_parameters();
+
+            // TODO: when recording audio only, allow param configuration?
+            if (!rec_video->isChecked()) v4lparameters.clear();
+
+            // Add alsa audio capture
+            if (!rec_audio->isChecked()) {
+                // if we do not want audio, make sure that we don't have audio encoding parameters
+                // this is required otherwise the MLT avformat consumer will not close properly
+                if (v4lparameters.contains("acodec")) {
+                    QString endParam = v4lparameters.section("acodec", 1);
+                    int vcodec = endParam.indexOf(" vcodec");
+                    int format = endParam.indexOf(" f=");
+                    int cutPosition = -1;
+                    if (vcodec > -1) {
+                        if (format  > -1) {
+                            cutPosition = qMin(vcodec, format);
+                        }
+                        else cutPosition = vcodec;
+                    }
+                    else if (format  > -1) {
+                        cutPosition = format;
+                    }
+                    else {
+                        // nothing interesting in end params
+                        endParam.clear();
+                    }
+                    if (cutPosition > -1) {
+                        endParam.remove(0, cutPosition);
+                    }
+                    v4lparameters = QString(v4lparameters.section("acodec", 0, 0) + "an=1 " + endParam).simplified();
+                }
+            }
+
+            showPreview = m_previewSettings->isChecked();
+            if (!rec_video->isChecked()) showPreview = false;
+
+            if (m_captureDevice->slotStartCapture(v4lparameters, m_captureFile.path(), playlist, showPreview, isXml)) {
+                videoBox->setHidden(false);
+                m_isCapturing = true;
+                m_recAction->setEnabled(false);
+                m_stopAction->setEnabled(true);
+                m_previewSettings->setEnabled(false);
+               control_frame->setEnabled(false);
+            }
+            else {
+                video_frame->setText(i18n("Failed to start Video4Linux,\ncheck your parameters..."));
+                videoBox->setHidden(true);
+               m_recAction->blockSignals(true);
+               m_recAction->setChecked(false);
+               m_recAction->blockSignals(false);
+                m_isCapturing = false;
+            }
             break;
+
+        case BLACKMAGIC:
+            slotActivateMonitor();
+            path = KdenliveSettings::current_profile();
+            profile = ProfilesDialog::getVideoProfile(path);
+            //m_videoBox->setRatio((double) profile.display_aspect_num / profile.display_aspect_den);
+            buildMltDevice(path);
+
+            playlist = QString("<producer id=\"producer0\" in=\"0\" out=\"99999\"><property name=\"mlt_type\">producer</property><property name=\"length\">100000</property><property name=\"eof\">pause</property><property name=\"resource\">%1</property><property name=\"mlt_service\">decklink</property></producer>").arg(KdenliveSettings::decklink_capturedevice());
+
+            if (m_captureDevice->slotStartCapture(KdenliveSettings::decklink_parameters(), m_captureFile.path(), QString("decklink:%1").arg(KdenliveSettings::decklink_capturedevice()), m_previewSettings->isChecked(), false)) {
+                videoBox->setHidden(false);
+                m_isCapturing = true;
+                slotSetInfoMessage(i18n("Capturing to %1", m_captureFile.fileName()));
+                m_recAction->setEnabled(false);
+                m_stopAction->setEnabled(true);
+                m_previewSettings->setEnabled(false);
+            }
+            else {
+                video_frame->setText(i18n("Failed to start Decklink,\ncheck your parameters..."));
+                slotSetInfoMessage(i18n("Failed to start capture"));
+                videoBox->setHidden(true);
+                m_isCapturing = false;
+            }
+            break;
+
         case SCREENGRAB:
-            switch (KdenliveSettings::rmd_capture_type()) {
-            case 0:
-                // Full screen capture, nothing special to do
-                break;
-            default:
+           m_captureArgs << "-f" << "x11grab";
+           if (KdenliveSettings::grab_follow_mouse()) m_captureArgs << "-follow_mouse" << "centered";
+           if (!KdenliveSettings::grab_hide_frame()) m_captureArgs << "-show_region" << "1";
+           captureSize = ":0.0";
+            if (KdenliveSettings::grab_capture_type() == 0) {
+                // Full screen capture
+               m_captureArgs << "-s" << QString::number(screenSize.width()) + "x" + QString::number(screenSize.height());
+           } else {
                 // Region capture
-                m_captureArgs << "-width" << QString::number(KdenliveSettings::rmd_width()) << "-height" << QString::number(KdenliveSettings::rmd_height());
-                if (!KdenliveSettings::rmd_follow_mouse()) {
-                    m_captureArgs << "-x" << QString::number(KdenliveSettings::rmd_offsetx()) << "-y" << QString::number(KdenliveSettings::rmd_offsety());
-                } else {
-                    m_captureArgs << "--follow-mouse";
-                    if (KdenliveSettings::rmd_hide_frame()) m_captureArgs << "--no-frame";
-                }
-                break;
+                m_captureArgs << "-s" << QString::number(KdenliveSettings::grab_width()) + "x" + QString::number(KdenliveSettings::grab_height());
+                captureSize.append("+" + QString::number(KdenliveSettings::grab_offsetx()) + "." + QString::number(KdenliveSettings::grab_offsetx()));
             }
+            // fps
+            m_captureArgs << "-r" << QString::number(KdenliveSettings::grab_fps());
+            if (KdenliveSettings::grab_hide_mouse()) captureSize.append("+nomouse");
+           m_captureArgs << "-i" << captureSize;
+           grabParameters = KdenliveSettings::grab_parameters().simplified().split(" ");
+           m_captureArgs << grabParameters;
+           m_captureArgs << path;
+           
             m_isCapturing = true;
-            if (KdenliveSettings::rmd_capture_audio()) {
-                m_captureArgs << "-freq" << KdenliveSettings::rmd_freq();
-                m_captureArgs << "-channels" << QString::number(KdenliveSettings::rmd_audio_channels());
+           m_recAction->setEnabled(false);
+            /*if (KdenliveSettings::rmd_capture_audio()) {
+                m_captureArgs << "--freq" << KdenliveSettings::rmd_freq();
+                m_captureArgs << "--channels" << QString::number(KdenliveSettings::rmd_audio_channels());
                 if (KdenliveSettings::rmd_use_jack()) {
-                    m_captureArgs << "-use-jack" << KdenliveSettings::rmd_jackports();
+                    m_captureArgs << "--use-jack";
+                    QStringList ports = KdenliveSettings::rmd_jackports().split(' ', QString::SkipEmptyParts);
+                    for (int i = 0; i < ports.count(); ++i) {
+                        m_captureArgs << ports.at(i);
+                    }
                     if (KdenliveSettings::rmd_jack_buffer() > 0.0)
-                        m_captureArgs << "-ring-buffer-size" << QString::number(KdenliveSettings::rmd_jack_buffer());
+                        m_captureArgs << "--ring-buffer-size" << QString::number(KdenliveSettings::rmd_jack_buffer());
                 } else {
                     if (!KdenliveSettings::rmd_alsadevicename().isEmpty())
-                        m_captureArgs << "-device" << KdenliveSettings::rmd_alsadevicename();
+                        m_captureArgs << "--device" << KdenliveSettings::rmd_alsadevicename();
                     if (KdenliveSettings::rmd_alsa_buffer() > 0)
-                        m_captureArgs << "-buffer-size" << QString::number(KdenliveSettings::rmd_alsa_buffer());
+                        m_captureArgs << "--buffer-size" << QString::number(KdenliveSettings::rmd_alsa_buffer());
                 }
-            } else m_captureArgs << "--no-sound";
-
-            if (KdenliveSettings::rmd_fullshots()) m_captureArgs << "--full-shots";
-            m_captureArgs << "-workdir" << KdenliveSettings::currenttmpfolder();
-            m_captureArgs << "-fps" << QString::number(KdenliveSettings::rmd_fps()) << "-o" << m_captureFile.path();
-            m_captureProcess->start(KdenliveSettings::rmd_path(), m_captureArgs);
-            kDebug() << "// RecordMyDesktop params: " << m_captureArgs;
+            } else m_captureArgs << "--no-sound";*/
+
+            m_captureProcess->start(KdenliveSettings::ffmpegpath(), m_captureArgs);
+           if (!m_captureProcess->waitForStarted()) {
+               // Problem launching capture app
+               showWarningMessage(i18n("Failed to start the capture application:\n%1", KdenliveSettings::ffmpegpath()));
+           }
+            //kDebug() << "// Screen grab params: " << m_captureArgs;
             break;
         default:
             break;
         }
 
 
-        if (device_selector->currentIndex() != SCREENGRAB) {
+        if (device_selector->currentIndex() == FIREWIRE) {
             m_isCapturing = true;
             kDebug() << "Capture: Running ffplay " << m_displayArgs.join(" ");
-            m_displayProcess->start("ffplay", m_displayArgs);
+            m_displayProcess->start(KdenliveSettings::ffplaypath(), m_displayArgs);
             video_frame->setText(i18n("Initialising..."));
         }
     } else {
@@ -534,6 +787,66 @@ void RecMonitor::slotRecord()
     }
 }
 
+
+void RecMonitor::showWarningMessage(const QString &text, bool logAction)
+{
+#if KDE_IS_VERSION(4,7,0)
+    m_infoMessage->setText(text);
+    m_infoMessage->setMessageType(KMessageWidget::Warning);
+    if (logAction) {
+       QAction *manualAction = new QAction(i18n("Show log"), this);
+       connect(manualAction, SIGNAL(triggered()), this, SLOT(slotShowLog()));
+       m_infoMessage->addAction(manualAction);
+    }
+#if KDE_IS_VERSION(4,10,0)
+    if (isVisible())
+       m_infoMessage->animatedShow();
+#else
+    QTimer::singleShot(0, m_infoMessage, SLOT(animatedShow()));
+#endif
+#else
+    if (!logAction) {
+       video_frame->setPixmap(mergeSideBySide(KIcon("dialog-warning").pixmap(QSize(50, 50)), text));
+       
+    }
+    else {
+       video_frame->setText(QString("<qt>" + text + "<br><a href=\"http://kde.org\">" + i18n("Show log") + "</a>"));
+       connect(video_frame, SIGNAL(linkActivated(QString)), this, SLOT(slotShowLog()));
+    }
+#endif
+}
+
+const QString RecMonitor::getV4lXmlPlaylist(const MltVideoProfile &profile, bool *isXml)
+{
+    QString playlist;
+    if (rec_video->isChecked() && rec_audio->isChecked()) {
+       // We want to capture audio and video, use xml playlist
+       *isXml = true;
+       playlist = QString("<mlt title=\"capture\" LC_NUMERIC=\"C\"><profile description=\"v4l\" width=\"%1\" height=\"%2\" progressive=\"%3\" sample_aspect_num=\"%4\" sample_aspect_den=\"%5\" display_aspect_num=\"%6\" display_aspect_den=\"%7\" frame_rate_num=\"%8\" frame_rate_den=\"%9\" colorspace=\"%10\"/>").arg(profile.width).arg(profile.height).arg(profile.progressive).arg(profile.sample_aspect_num).arg(profile.sample_aspect_den).arg(profile.display_aspect_num).arg(profile.display_aspect_den).arg(profile.frame_rate_num).arg(profile.frame_rate_den).arg(profile.colorspace);
+
+        playlist.append(QString("<producer id=\"producer0\" in=\"0\" out=\"999999\"><property name=\"mlt_type\">producer</property><property name=\"length\">1000000</property><property name=\"eof\">loop</property><property name=\"resource\">video4linux2:%1?width:%2&amp;height:%3&amp;frame_rate:%4</property><property name=\"mlt_service\">avformat-novalidate</property></producer><playlist id=\"playlist0\"><entry producer=\"producer0\" in=\"0\" out=\"999999\"/></playlist>").arg(KdenliveSettings::video4vdevice()).arg(profile.width).arg(profile.height).arg((double) profile.frame_rate_num / profile.frame_rate_den));
+    
+        playlist.append(QString("<producer id=\"producer1\" in=\"0\" out=\"999999\"><property name=\"mlt_type\">producer</property><property name=\"length\">1000000</property><property name=\"resource\">alsa:%1?channels=%2</property><property name=\"audio_index\">0</property><property name=\"video_index\">-1</property><property name=\"mlt_service\">avformat-novalidate</property></producer><playlist id=\"playlist1\"><entry producer=\"producer1\" in=\"0\" out=\"999999\"/></playlist>").arg(KdenliveSettings::v4l_alsadevicename()).arg(KdenliveSettings::alsachannels()));
+
+       playlist.append("<tractor id=\"tractor0\" title=\"video0\" global_feed=\"1\" in=\"0\" out=\"999999\">");
+       playlist.append("<track producer=\"playlist0\"/><track producer=\"playlist1\"/>");
+       playlist.append("</tractor></mlt>");
+    }
+    else if (rec_audio->isChecked()) {
+       // Audio only recording
+       *isXml = false;
+       playlist =QString("alsa:%1?channels=%2").arg(KdenliveSettings::v4l_alsadevicename()).arg(KdenliveSettings::alsachannels());
+    }
+    else {
+       // Video only recording
+       *isXml = false;
+       playlist =QString("video4linux2:%1?width:%2&amp;height:%3&amp;frame_rate:%4").arg(KdenliveSettings::video4vdevice()).arg(profile.width).arg(profile.height).arg((double) profile.frame_rate_num / profile.frame_rate_den);
+       
+    }
+    
+    return playlist;
+}
+
 /*
 void RecMonitor::slotStartGrab(const QRect &rect) {
     rgnGrab->deleteLater();
@@ -560,7 +873,7 @@ void RecMonitor::slotStartGrab(const QRect &rect) {
         alsaProcess->start("arecord", alsaArgs);
     }
     kDebug() << "Capture: Running ffmpeg " << m_captureArgs.join(" ");
-    captureProcess->start("ffmpeg", m_captureArgs);
+    captureProcess->start(KdenliveSettings::ffmpegpath(), m_captureArgs);
 }*/
 
 void RecMonitor::slotProcessStatus(QProcess::ProcessState status)
@@ -568,7 +881,10 @@ void RecMonitor::slotProcessStatus(QProcess::ProcessState status)
     if (status == QProcess::NotRunning) {
         m_displayProcess->kill();
         if (m_isCapturing && device_selector->currentIndex() != FIREWIRE)
-            if (autoaddbox->isChecked() && QFile::exists(m_captureFile.path())) emit addProjectClip(m_captureFile);
+            if (m_addCapturedClip->isChecked() && !m_captureFile.isEmpty() && QFile::exists(m_captureFile.path())) {
+                emit addProjectClip(m_captureFile);
+                m_captureFile.clear();
+            }
         if (device_selector->currentIndex() == FIREWIRE) {
             m_discAction->setIcon(KIcon("network-connect"));
             m_discAction->setText(i18n("Connect"));
@@ -577,27 +893,35 @@ void RecMonitor::slotProcessStatus(QProcess::ProcessState status)
             m_fwdAction->setEnabled(false);
             m_recAction->setEnabled(false);
         }
+        else {
+           m_recAction->setEnabled(true);
+       }
         m_isPlaying = false;
         m_playAction->setIcon(m_playIcon);
         m_recAction->setChecked(false);
         m_stopAction->setEnabled(false);
         device_selector->setEnabled(true);
         if (m_captureProcess && m_captureProcess->exitStatus() == QProcess::CrashExit) {
-            video_frame->setText(i18n("Capture crashed, please check your parameters"));
+           showWarningMessage(i18n("Capture crashed, please check your parameters"), true);
         } else {
-            if (device_selector->currentIndex() != SCREENGRAB) video_frame->setText(i18n("Not connected"));
-            else video_frame->setPixmap(mergeSideBySide(KIcon("video-display").pixmap(QSize(50, 50)), i18n("Press record button\nto start screen capture\nFiles will be saved in:\n%1", KdenliveSettings::capturefolder())));
+            if (device_selector->currentIndex() != SCREENGRAB) {
+                video_frame->setText(i18n("Not connected"));
+            } else {
+               int code = m_captureProcess->exitCode();
+                if (code != 0 && code != 255) {
+                    showWarningMessage(i18n("Capture crashed, please check your parameters"), true);
+                } else {
+                    video_frame->setPixmap(mergeSideBySide(KIcon("video-display").pixmap(QSize(50, 50)), i18n("Press record button\nto start screen capture\nFiles will be saved in:\n%1", m_capturePath)));
+                }
+            }
         }
         m_isCapturing = false;
 
-#if KDE_IS_VERSION(4,2,0)
         m_spaceTimer.stop();
         // update free space info
         slotUpdateFreeSpace();
-#endif
-
     } else {
-        if (device_selector->currentIndex() != SCREENGRAB) m_stopAction->setEnabled(true);
+        if (device_selector->currentIndex()) m_stopAction->setEnabled(true);
         device_selector->setEnabled(false);
     }
 }
@@ -617,94 +941,131 @@ void RecMonitor::manageCapturedFiles()
         extension = ".m2t";
         break;
     }
-    QDir dir(KdenliveSettings::capturefolder());
+    QDir dir(m_capturePath);
     QStringList filters;
     QString capturename = KdenliveSettings::dvgrabfilename();
     if (capturename.isEmpty()) capturename = "capture";
-    filters << capturename + "*" + extension;
+    filters << capturename + '*' + extension;
     const QStringList result = dir.entryList(filters, QDir::Files, QDir::Time);
     KUrl::List capturedFiles;
-    foreach(const QString &name, result) {
+    foreach(const QString & name, result) {
         KUrl url = KUrl(dir.filePath(name));
         if (KIO::NetAccess::exists(url, KIO::NetAccess::SourceSide, this)) {
             KFileItem file(KFileItem::Unknown, KFileItem::Unknown, url, true);
-            if (file.time(KFileItem::ModificationTime) > m_captureTime) capturedFiles.append(url);
+            if (file.time(KFileItem::ModificationTime) > m_captureTime) {
+                // The file was captured in the last batch
+                if (url.fileName().contains(':')) {
+                    // Several dvgrab options (--timecode,...) use : in the file name, which is
+                    // not supported by MLT, so rename them
+                    QString newUrl = url.directory(KUrl::AppendTrailingSlash) + url.fileName().replace(':', '_');
+                    if (QFile::rename(url.path(), newUrl)) {
+                        url = KUrl(newUrl);
+                    }
+
+                }
+                capturedFiles.append(url);
+            }
         }
     }
     kDebug() << "Found : " << capturedFiles.count() << " new capture files";
     kDebug() << capturedFiles;
 
-    if (capturedFiles.count() > 0) {
-        ManageCapturesDialog *d = new ManageCapturesDialog(capturedFiles, this);
+    if (!capturedFiles.isEmpty()) {
+        QPointer<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;
     }
 }
 
 // virtual
-void RecMonitor::mousePressEvent(QMouseEvent * /*event*/)
+void RecMonitor::mousePressEvent(QMouseEvent *event)
 {
-#if KDE_IS_VERSION(4,2,0)
     if (m_freeSpace->underMouse()) slotUpdateFreeSpace();
-#endif
+    else QWidget::mousePressEvent(event);//m_videoBox->mousePressEvent(event);
 }
 
 void RecMonitor::slotUpdateFreeSpace()
 {
-#if KDE_IS_VERSION(4,2,0)
-    KDiskFreeSpaceInfo info = KDiskFreeSpaceInfo::freeSpaceInfo(KdenliveSettings::capturefolder());
-    if (info.isValid()) {
+    KDiskFreeSpaceInfo info = KDiskFreeSpaceInfo::freeSpaceInfo(m_capturePath);
+    if (info.isValid() && info.size() > 0) {
         m_freeSpace->setValue(100 * info.used() / info.size());
         m_freeSpace->setText(i18n("Free space: %1", KIO::convertSize(info.available())));
         m_freeSpace->update();
     }
-#endif
 }
 
-void RecMonitor::activateRecMonitor()
+void RecMonitor::refreshRecMonitor(bool visible)
 {
-    //if (!m_isActive) m_monitorManager->activateRecMonitor(m_name);
+    if (visible) {
+        //if (!m_isActive) activateMonitor();
+
+    }
 }
 
-void RecMonitor::stop()
+void RecMonitor::slotPlay()
 {
-    m_isActive = false;
-
+    /*if (m_isPlaying) slotStopCapture();
+    else slotStartPreview(true);*/
 }
 
-void RecMonitor::start()
+void RecMonitor::slotReadProcessInfo()
 {
-    m_isActive = true;
+    QString data = m_captureProcess->readAllStandardError().simplified();
+    if (device_selector->currentIndex() == SCREENGRAB) {
+       m_error.append(data + "\n");
+    }
+    else if (device_selector->currentIndex() == FIREWIRE) {
+       data = data.section('"', 2, 2).simplified();
+       m_dvinfo.setText(data.left(11));
+       m_dvinfo.updateGeometry();
+    }
+}
 
+void RecMonitor::slotShowLog()
+{
+    KMessageBox::information(this, m_error);
 }
 
-void RecMonitor::refreshRecMonitor(bool visible)
+AbstractRender *RecMonitor::abstractRender()
 {
-    if (visible) {
-        //if (!m_isActive) m_monitorManager->activateRecMonitor(m_name);
+    return m_captureDevice;
+}
 
-    }
+
+void RecMonitor::analyseFrames(bool analyse)
+{
+    m_analyse = analyse;
+    if (m_captureDevice) m_captureDevice->sendFrameForAnalysis = analyse;
 }
 
-void RecMonitor::slotPlay()
+void RecMonitor::slotDroppedFrames(int dropped)
 {
+    slotSetInfoMessage(i18n("%1 dropped frames", dropped));
+}
 
-    //if (!m_isActive) m_monitorManager->activateRecMonitor(m_name);
+void RecMonitor::buildMltDevice(const QString &path)
+{
+    if (m_captureDevice == NULL) {
+       m_monitorManager->updateScopeSource();
+        m_captureDevice = new MltDeviceCapture(path, videoSurface, this);
+        connect(m_captureDevice, SIGNAL(droppedFrames(int)), this, SLOT(slotDroppedFrames(int)));
+        m_captureDevice->sendFrameForAnalysis = m_analyse;
+        m_monitorManager->updateScopeSource();
+    }
+}
 
+void RecMonitor::slotChangeRecordingPreview(bool enable)
+{
+    KdenliveSettings::setEnable_recording_preview(enable);
 }
 
-void RecMonitor::slotReadDvgrabInfo()
+
+void RecMonitor::slotMouseSeek(int /*eventDelta*/, bool /*fast*/)
 {
-    QString data = m_captureProcess->readAllStandardError().simplified();
-    data = data.section('"', 2, 2).simplified();
-    m_dvinfo.setText(data.left(11));
-    m_dvinfo.updateGeometry();
 }
 
+
 #include "recmonitor.moc"