]> git.sesse.net Git - kdenlive/blobdiff - src/stopmotion/stopmotion.cpp
Const'ref
[kdenlive] / src / stopmotion / stopmotion.cpp
index 6c8f535e286ed54db9e6a27ab48188d13fd880d8..6235ac91485874d904866f5c2f2298f3028645e0 100644 (file)
  ***************************************************************************/
 
 #include "stopmotion.h"
-#include "../blackmagic/devices.h"
-#include "../v4l/v4lcapture.h"
-#include "../slideshowclip.h"
+#ifdef USE_V4L
+#include "v4l/v4lcapture.h"
+#endif
+#include "slideshowclip.h"
+#include "profilesdialog.h"
+#include "mltdevicecapture.h"
+#include "recmonitor.h"
+#include "monitormanager.h"
 #include "ui_smconfig_ui.h"
 #include "kdenlivesettings.h"
 
-
 #include <KDebug>
 #include <KGlobalSettings>
 #include <KFileDialog>
 #include <kdeversion.h>
 #include <KNotification>
 
-#ifdef QIMAGEBLITZ
-#include <qimageblitz/qimageblitz.h>
-#endif
-
 #include <QtConcurrentRun>
 #include <QInputDialog>
 #include <QComboBox>
@@ -50,7 +50,7 @@ MyLabel::MyLabel(QWidget* parent) :
 {
 }
 
-void MyLabel::setImage(QImage img)
+void MyLabel::setImage(const QImage& img)
 {
     m_img = img;
 }
@@ -58,8 +58,10 @@ void MyLabel::setImage(QImage img)
 //virtual
 void MyLabel::wheelEvent(QWheelEvent* event)
 {
-    if (event->delta() > 0) emit seek(true);
-    else emit seek(false);
+    if (event->delta() > 0)
+        emit seek(true);
+    else
+        emit seek(false);
 }
 
 //virtual
@@ -90,20 +92,81 @@ void MyLabel::paintEvent(QPaintEvent* event)
 }
 
 
-StopmotionWidget::StopmotionWidget(KUrl projectFolder, QList< QAction* > actions, QWidget* parent) :
+StopmotionMonitor::StopmotionMonitor(MonitorManager *manager, QWidget *parent) :
+    AbstractMonitor(Kdenlive::stopmotionMonitor, manager, parent),
+    m_captureDevice(NULL)
+{
+    createVideoSurface();
+}
+
+StopmotionMonitor::~StopmotionMonitor()
+{
+}
+
+void StopmotionMonitor::slotSwitchFullScreen()
+{
+}
+
+void StopmotionMonitor::setRender(MltDeviceCapture *render)
+{
+    m_captureDevice = render;
+}
+
+AbstractRender *StopmotionMonitor::abstractRender()
+{
+    return m_captureDevice;
+}
+
+Kdenlive::MONITORID StopmotionMonitor::id() const
+{
+    return Kdenlive::stopmotionMonitor;
+}
+
+
+void StopmotionMonitor::stop()
+{
+    if (m_captureDevice) m_captureDevice->stop();
+    emit stopCapture();
+}
+
+void StopmotionMonitor::start()
+{
+}
+
+void StopmotionMonitor::slotPlay()
+{
+}
+
+void StopmotionMonitor::slotMouseSeek(int /*eventDelta*/, bool /*fast*/)
+{
+}
+
+StopmotionWidget::StopmotionWidget(MonitorManager *manager, const KUrl &projectFolder, const QList<QAction *> &actions, QWidget* parent) :
     QDialog(parent)
-    , Ui::Stopmotion_UI()
-    , m_projectFolder(projectFolder)
-    , m_bmCapture(NULL)
-    , m_sequenceFrame(0)
-    , m_animatedIndex(-1)
-    , m_animate(false)
+  , Ui::Stopmotion_UI()
+  , m_projectFolder(projectFolder)
+  , m_captureDevice(NULL)
+  , m_sequenceFrame(0)
+  , m_animatedIndex(-1)
+  , m_animate(false)
+  , m_manager(manager)
+  , m_monitor(new StopmotionMonitor(manager, this))
 {
     //setAttribute(Qt::WA_DeleteOnClose);
+    //HACK: the monitor widget is hidden, it is just used to control the capturedevice from monitormanager
+    m_monitor->setHidden(true);
+    connect(m_monitor, SIGNAL(stopCapture()), this, SLOT(slotStopCapture()));
+    m_manager->appendMonitor(m_monitor);
     QAction* analyse = new QAction(i18n("Send frames to color scopes"), this);
     analyse->setCheckable(true);
     analyse->setChecked(KdenliveSettings::analyse_stopmotion());
     connect(analyse, SIGNAL(triggered(bool)), this, SLOT(slotSwitchAnalyse(bool)));
+
+    QAction* mirror = new QAction(i18n("Mirror display"), this);
+    mirror->setCheckable(true);
+    //mirror->setChecked(KdenliveSettings::analyse_stopmotion());
+    connect(mirror, SIGNAL(triggered(bool)), this, SLOT(slotSwitchMirror(bool)));
+
     addActions(actions);
     setupUi(this);
     setWindowTitle(i18n("Stop Motion Capture"));
@@ -124,10 +187,10 @@ StopmotionWidget::StopmotionWidget(KUrl projectFolder, QList< QAction* > actions
     intervalCapture->setCheckable(true);
     intervalCapture->setChecked(false);
     capture_interval->setDefaultAction(intervalCapture);
-        
+
     preview_button->setIcon(KIcon("media-playback-start"));
     capture_button->setEnabled(false);
-    
+
 
     // Build config menu
     QMenu* confMenu = new QMenu;
@@ -136,22 +199,21 @@ StopmotionWidget::StopmotionWidget(KUrl projectFolder, QList< QAction* > actions
     overlay_button->setDefaultAction(m_showOverlay);
     //confMenu->addAction(m_showOverlay);
 
-#ifdef QIMAGEBLITZ
-    m_effectIndex = KdenliveSettings::blitzeffect();
+    m_effectIndex = KdenliveSettings::stopmotioneffect();
     QMenu* effectsMenu = new QMenu(i18n("Overlay effect"));
     QActionGroup* effectGroup = new QActionGroup(this);
     QAction* noEffect = new QAction(i18n("No Effect"), effectGroup);
-    noEffect->setData(1);
+    noEffect->setData(0);
     QAction* contrastEffect = new QAction(i18n("Contrast"), effectGroup);
-    contrastEffect->setData(2);
+    contrastEffect->setData(1);
     QAction* edgeEffect = new QAction(i18n("Edge detect"), effectGroup);
-    edgeEffect->setData(3);
+    edgeEffect->setData(2);
     QAction* brightEffect = new QAction(i18n("Brighten"), effectGroup);
-    brightEffect->setData(4);
+    brightEffect->setData(3);
     QAction* invertEffect = new QAction(i18n("Invert"), effectGroup);
-    invertEffect->setData(5);
+    invertEffect->setData(4);
     QAction* thresEffect = new QAction(i18n("Threshold"), effectGroup);
-    thresEffect->setData(6);
+    thresEffect->setData(5);
 
     effectsMenu->addAction(noEffect);
     effectsMenu->addAction(contrastEffect);
@@ -160,7 +222,7 @@ StopmotionWidget::StopmotionWidget(KUrl projectFolder, QList< QAction* > actions
     effectsMenu->addAction(invertEffect);
     effectsMenu->addAction(thresEffect);
     QList <QAction*> list = effectsMenu->actions();
-    for (int i = 0; i < list.count(); i++) {
+    for (int i = 0; i < list.count(); ++i) {
         list.at(i)->setCheckable(true);
         if (list.at(i)->data().toInt() == m_effectIndex) {
             list.at(i)->setChecked(true);
@@ -168,7 +230,6 @@ StopmotionWidget::StopmotionWidget(KUrl projectFolder, QList< QAction* > actions
     }
     connect(effectsMenu, SIGNAL(triggered(QAction*)), this, SLOT(slotUpdateOverlayEffect(QAction*)));
     confMenu->addMenu(effectsMenu);
-#endif
 
     QAction* showThumbs = new QAction(KIcon("image-x-generic"), i18n("Show sequence thumbnails"), this);
     showThumbs->setCheckable(true);
@@ -185,27 +246,32 @@ StopmotionWidget::StopmotionWidget(KUrl projectFolder, QList< QAction* > actions
     confMenu->addAction(showThumbs);
     confMenu->addAction(removeCurrent);
     confMenu->addAction(analyse);
+    confMenu->addAction(mirror);
     confMenu->addAction(conf);
     config_button->setIcon(KIcon("configure"));
     config_button->setMenu(confMenu);
 
-    connect(sequence_name, SIGNAL(textChanged(const QString&)), this, SLOT(sequenceNameChanged(const QString&)));
+    connect(sequence_name, SIGNAL(textChanged(QString)), this, SLOT(sequenceNameChanged(QString)));
     connect(sequence_name, SIGNAL(currentIndexChanged(int)), live_button, SLOT(setFocus()));
 
-    m_layout = new QVBoxLayout;
-    if (BMInterface::getBlackMagicDeviceList(capture_device, NULL)) {
+    // Video widget holder
+    QVBoxLayout *layout = new QVBoxLayout;
+    layout->setContentsMargins(0, 0, 0, 0);
+    layout->setSpacing(0);
+    m_monitor->videoBox->setLineWidth(4);
+    layout->addWidget(m_monitor->videoBox);
+
+    if (KdenliveSettings::decklink_device_found()) {
         // Found a BlackMagic device
-        m_bmCapture = new BmdCaptureHandler(m_layout);
-        connect(m_bmCapture, SIGNAL(gotMessage(const QString&)), this, SLOT(slotGotHDMIMessage(const QString&)));
     }
+
     if (QFile::exists(KdenliveSettings::video4vdevice())) {
-#if !defined(Q_WS_MAC) && !defined(Q_OS_FREEBSD)
-        V4lCaptureHandler v4l(NULL);
+#ifdef USE_V4L
         // Video 4 Linux device detection
-        for (int i = 0; i < 10; i++) {
+        for (int i = 0; i < 10; ++i) {
             QString path = "/dev/video" + QString::number(i);
             if (QFile::exists(path)) {
-                QStringList deviceInfo = v4l.getDeviceName(path);
+                QStringList deviceInfo = V4lCaptureHandler::getDeviceName(path);
                 if (!deviceInfo.isEmpty()) {
                     capture_device->addItem(deviceInfo.at(0), "v4l");
                     capture_device->setItemData(capture_device->count() - 1, path, Qt::UserRole + 1);
@@ -214,29 +280,40 @@ StopmotionWidget::StopmotionWidget(KUrl projectFolder, QList< QAction* > actions
                 }
             }
         }
-
-        /*V4lCaptureHandler v4lhandler(NULL);
-        QStringList deviceInfo = v4lhandler.getDeviceName(KdenliveSettings::video4vdevice());
-            capture_device->addItem(deviceInfo.at(0), "v4l");
-        capture_device->setItemData(capture_device->count() - 1, deviceInfo.at(3), Qt::UserRole + 1);*/
-        if (m_bmCapture == NULL) {
-            m_bmCapture = new V4lCaptureHandler(m_layout);
-            m_bmCapture->setDevice(capture_device->itemData(capture_device->currentIndex(), Qt::UserRole + 1).toString(), capture_device->itemData(capture_device->currentIndex(), Qt::UserRole + 2).toString());
-        }
-#endif
+#endif /* USE_V4L */
     }
 
-    connect(capture_device, SIGNAL(currentIndexChanged(int)), this, SLOT(slotUpdateHandler()));
-    if (m_bmCapture) {
-        connect(m_bmCapture, SIGNAL(frameSaved(const QString)), this, SLOT(slotNewThumb(const QString)));
+    connect(capture_device, SIGNAL(currentIndexChanged(int)), this, SLOT(slotUpdateDeviceHandler()));
+    /*if (m_bmCapture) {
+        connect(m_bmCapture, SIGNAL(frameSaved(QString)), this, SLOT(slotNewThumb(QString)));
         connect(m_bmCapture, SIGNAL(gotFrame(QImage)), this, SIGNAL(gotFrame(QImage)));
-    } else live_button->setEnabled(false);
+    } else live_button->setEnabled(false);*/
+
     m_frame_preview = new MyLabel(this);
     connect(m_frame_preview, SIGNAL(seek(bool)), this, SLOT(slotSeekFrame(bool)));
     connect(m_frame_preview, SIGNAL(switchToLive()), this, SLOT(slotSwitchLive()));
-    m_layout->addWidget(m_frame_preview);
+    layout->addWidget(m_frame_preview);
     m_frame_preview->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-    video_preview->setLayout(m_layout);
+    video_preview->setLayout(layout);
+
+    //kDebug()<<video_preview->winId();
+
+    QString profilePath;
+    // Create MLT producer data
+    if (capture_device->itemData(capture_device->currentIndex()) == "v4l") {
+        // Capture using a video4linux device
+        profilePath = KStandardDirs::locateLocal("appdata", "profiles/video4linux");
+    }
+    else {
+        // Decklink capture
+        profilePath = KdenliveSettings::current_profile();
+    }
+
+    m_captureDevice = new MltDeviceCapture(profilePath, m_monitor->videoSurface, this);
+    m_captureDevice->sendFrameForAnalysis = KdenliveSettings::analyse_stopmotion();
+    m_monitor->setRender(m_captureDevice);
+    connect(m_captureDevice, SIGNAL(frameSaved(QString)), this, SLOT(slotNewThumb(QString)));
+
     live_button->setChecked(false);
     button_addsequence->setEnabled(false);
     connect(live_button, SIGNAL(toggled(bool)), this, SLOT(slotLive(bool)));
@@ -244,7 +321,7 @@ StopmotionWidget::StopmotionWidget(KUrl projectFolder, QList< QAction* > actions
     connect(preview_button, SIGNAL(clicked(bool)), this, SLOT(slotPlayPreview(bool)));
     connect(frame_list, SIGNAL(currentRowChanged(int)), this, SLOT(slotShowSelectedFrame()));
     connect(frame_list, SIGNAL(itemClicked(QListWidgetItem*)), this, SLOT(slotShowSelectedFrame()));
-    connect(this, SIGNAL(doCreateThumbs(QImage, int)), this, SLOT(slotCreateThumbs(QImage, int)));
+    connect(this, SIGNAL(doCreateThumbs(QImage,int)), this, SLOT(slotCreateThumbs(QImage,int)));
 
     frame_list->addAction(removeCurrent);
     frame_list->setContextMenuPolicy(Qt::ActionsContextMenu);
@@ -258,17 +335,21 @@ StopmotionWidget::StopmotionWidget(KUrl projectFolder, QList< QAction* > actions
 
 StopmotionWidget::~StopmotionWidget()
 {
-    if (m_bmCapture)
-        m_bmCapture->stopPreview();
+    m_manager->removeMonitor(m_monitor);
+    if (m_captureDevice) {
+        m_captureDevice->stop();
+        delete m_captureDevice;
+        m_captureDevice = NULL;
+    }
+
+    delete m_monitor;
 }
 
 void StopmotionWidget::slotUpdateOverlayEffect(QAction* act)
 {
-#ifdef QIMAGEBLITZ
     if (act) m_effectIndex = act->data().toInt();
-    KdenliveSettings::setBlitzeffect(m_effectIndex);
-    if (m_showOverlay->isChecked()) slotUpdateOverlay();
-#endif
+    KdenliveSettings::setStopmotioneffect(m_effectIndex);
+    slotUpdateOverlay();
 }
 
 void StopmotionWidget::closeEvent(QCloseEvent* e)
@@ -291,7 +372,7 @@ void StopmotionWidget::slotConfigure()
     ui.sm_prenotify->setChecked(KdenliveSettings::sm_prenotify());
     ui.sm_loop->setChecked(KdenliveSettings::sm_loop());
     ui.sm_framesplayback->setValue(KdenliveSettings::sm_framesplayback());
-    
+
     if (d.exec() == QDialog::Accepted) {
         KdenliveSettings::setSm_loop(ui.sm_loop->isChecked());
         KdenliveSettings::setCaptureinterval(ui.sm_interval->value());
@@ -316,25 +397,28 @@ void StopmotionWidget::slotShowThumbs(bool show)
 }
 
 
-void StopmotionWidget::slotUpdateHandler()
+void StopmotionWidget::slotUpdateDeviceHandler()
 {
-    QString data = capture_device->itemData(capture_device->currentIndex()).toString();
+    slotLive(false);
+    delete m_captureDevice;
+    m_captureDevice = NULL;
+    /*QString data = capture_device->itemData(capture_device->currentIndex()).toString();
     slotLive(false);
     if (m_bmCapture) {
         delete m_bmCapture;
     }
     m_layout->removeWidget(m_frame_preview);
     if (data == "v4l") {
-#if !defined(Q_WS_MAC) && !defined(Q_OS_FREEBSD)
+#ifdef USE_V4L
         m_bmCapture = new V4lCaptureHandler(m_layout);
         m_bmCapture->setDevice(capture_device->itemData(capture_device->currentIndex(), Qt::UserRole + 1).toString(), capture_device->itemData(capture_device->currentIndex(), Qt::UserRole + 2).toString());
 #endif
     } else {
         m_bmCapture = new BmdCaptureHandler(m_layout);
-        if (m_bmCapture) connect(m_bmCapture, SIGNAL(gotMessage(const QString&)), this, SLOT(slotGotHDMIMessage(const QString&)));
+        if (m_bmCapture) connect(m_bmCapture, SIGNAL(gotMessage(QString)), this, SLOT(slotGotHDMIMessage(QString)));
     }
     live_button->setEnabled(m_bmCapture != NULL);
-    m_layout->addWidget(m_frame_preview);
+    m_layout->addWidget(m_frame_preview);*/
 }
 
 void StopmotionWidget::slotGotHDMIMessage(const QString& message)
@@ -352,28 +436,92 @@ void StopmotionWidget::parseExistingSequences()
     //dir.setNameFilters(filters);
     QStringList sequences = dir.entryList(filters, QDir::Files, QDir::Name);
     //kDebug()<<"PF: "<<<<", sm: "<<sequences;
-    foreach(QString sequencename, sequences) {
-        sequence_name->addItem(sequencename.section("_", 0, -2));
+    foreach(const QString &sequencename, sequences) {
+        sequence_name->addItem(sequencename.section('_', 0, -2));
     }
 }
 
 void StopmotionWidget::slotSwitchLive()
 {
     setUpdatesEnabled(false);
-    if (m_frame_preview->isHidden()) {
-        if (m_bmCapture) m_bmCapture->hidePreview(true);
-        m_frame_preview->setHidden(false);
-    } else {
-        m_frame_preview->setHidden(true);
-        if (m_bmCapture) m_bmCapture->hidePreview(false);
-        capture_button->setEnabled(true);
-    }
+    slotLive(!live_button->isChecked());
     setUpdatesEnabled(true);
 }
 
+void StopmotionWidget::slotStopCapture()
+{
+    slotLive(false);
+}
+
 void StopmotionWidget::slotLive(bool isOn)
 {
     live_button->blockSignals(true);
+    capture_button->setEnabled(false);
+    if (isOn) {
+        m_frame_preview->setHidden(true);
+        m_monitor->videoBox->setHidden(false);
+        QLocale locale;
+
+        MltVideoProfile profile;
+        QString resource;
+        QString service;
+        QString profilePath;
+        // Create MLT producer data
+        if (capture_device->itemData(capture_device->currentIndex()) == "v4l") {
+            // Capture using a video4linux device
+            profilePath = KStandardDirs::locateLocal("appdata", "profiles/video4linux");
+            profile = ProfilesDialog::getVideoProfile(profilePath);
+            service = "avformat-novalidate";
+            QString devicePath = capture_device->itemData(capture_device->currentIndex(), Qt::UserRole + 1).toString();
+            resource = QString("video4linux2:%1?width:%2&amp;height:%3&amp;frame_rate:%4").arg(devicePath).arg(profile.width).arg(profile.height).arg((double) profile.frame_rate_num / profile.frame_rate_den);
+        }
+        else {
+            // Decklink capture
+            profilePath = KdenliveSettings::current_profile();
+            profile = ProfilesDialog::getVideoProfile(profilePath);
+            service = "decklink";
+            resource = capture_device->itemData(capture_device->currentIndex(), Qt::UserRole + 1).toString();
+        }
+
+        if (m_captureDevice == NULL) {
+            m_captureDevice = new MltDeviceCapture(profilePath, m_monitor->videoSurface, this);
+            m_captureDevice->sendFrameForAnalysis = KdenliveSettings::analyse_stopmotion();
+            m_monitor->setRender(m_captureDevice);
+            connect(m_captureDevice, SIGNAL(frameSaved(QString)), this, SLOT(slotNewThumb(QString)));
+        }
+
+        m_manager->activateMonitor(Kdenlive::stopmotionMonitor);
+        QString producer = createProducer(profile, service, resource);
+        if (m_captureDevice->slotStartPreview(producer, true)) {
+            if (m_showOverlay->isChecked()) {
+                reloadOverlay();
+                slotUpdateOverlay();
+            }
+            capture_button->setEnabled(true);
+            live_button->setChecked(true);
+            log_box->insertItem(-1, i18n("Playing %1x%2 (%3 fps)", profile.width, profile.height, locale.toString((double)profile.frame_rate_num/profile.frame_rate_den).rightJustified(2, '0')));
+            log_box->setCurrentIndex(0);
+        }
+        else {
+            kDebug()<<"// problem starting stopmo";
+            log_box->insertItem(-1, i18n("Failed to start device"));
+            log_box->setCurrentIndex(0);
+        }
+    }
+    else {
+        m_frame_preview->setHidden(false);
+        live_button->setChecked(false);
+        if (m_captureDevice) {
+            m_captureDevice->stop();
+            m_monitor->videoBox->setHidden(true);
+            log_box->insertItem(-1, i18n("Stopped"));
+            log_box->setCurrentIndex(0);
+            //delete m_captureDevice;
+            //m_captureDevice = NULL;
+        }
+    }
+
+    /*
     if (isOn && m_bmCapture) {
         //m_frame_preview->setImage(QImage());
         m_frame_preview->setHidden(true);
@@ -385,63 +533,72 @@ void StopmotionWidget::slotLive(bool isOn)
         m_frame_preview->setHidden(false);
         capture_button->setEnabled(false);
         live_button->setChecked(false);
-    }
+    }*/
     live_button->blockSignals(false);
 }
 
 void StopmotionWidget::slotShowOverlay(bool isOn)
 {
     if (isOn) {
-        if (live_button->isChecked() && m_sequenceFrame > 0) {
-            slotUpdateOverlay();
-        }
-    } else if (m_bmCapture) {
-        m_bmCapture->hideOverlay();
+        // Overlay last frame of the sequence
+        reloadOverlay();
+        slotUpdateOverlay();
+    }
+    else {
+        // Remove overlay
+        m_captureDevice->setOverlay(QString());
     }
 }
 
-void StopmotionWidget::slotUpdateOverlay()
+void StopmotionWidget::reloadOverlay()
 {
-    if (m_bmCapture == NULL) return;
     QString path = getPathForFrame(m_sequenceFrame - 1);
-    if (!QFile::exists(path)) return;
-    QImage img(path);
-    if (img.isNull()) {
-        QTimer::singleShot(1000, this, SLOT(slotUpdateOverlay()));
+    if (!QFile::exists(path)) {
+        log_box->insertItem(-1, i18n("No previous frame found"));
+        log_box->setCurrentIndex(0);
         return;
     }
+    m_captureDevice->setOverlay(path);
+}
+
+void StopmotionWidget::slotUpdateOverlay()
+{
+    if (m_captureDevice == NULL) return;
+
+    QString tag;
+    QStringList params;
 
-#ifdef QIMAGEBLITZ
-    //img = Blitz::convolveEdge(img, 0, Blitz::Low);
     switch (m_effectIndex) {
+    case 1:
+        tag = "frei0r.contrast0r";
+        params << "Contrast=1.2";
+        break;
     case 2:
-        img = Blitz::contrast(img, true, 6);
+        tag = "charcoal";
+        params << "x_scatter=4" << "y_scatter=4" << "scale=1" << "mix=0";
         break;
     case 3:
-        img = Blitz::edge(img);
+        tag = "frei0r.brightness";
+        params << "Brightness=0.7";
         break;
     case 4:
-        img = Blitz::intensity(img, 0.5);
+        tag = "invert";
         break;
     case 5:
-        Blitz::invert(img);
-        break;
-    case 6:
-        img = Blitz::threshold(img, 120, Blitz::Grayscale, qRgba(0, 0, 0, 0), qRgba(255, 0, 0, 255));
-        //img = Blitz::flatten(img, QColor(255, 0, 0, 255), QColor(0, 0, 0, 0));
+        tag = "threshold";
+        params << "midpoint=125";
         break;
     default:
         break;
 
     }
-#endif
-    m_bmCapture->showOverlay(img);
+    m_captureDevice->setOverlayEffect(tag, params);
 }
 
 void StopmotionWidget::sequenceNameChanged(const QString& name)
 {
     // Get rid of frames from previous sequence
-    disconnect(this, SIGNAL(doCreateThumbs(QImage, int)), this, SLOT(slotCreateThumbs(QImage, int)));
+    disconnect(this, SIGNAL(doCreateThumbs(QImage,int)), this, SLOT(slotCreateThumbs(QImage,int)));
     m_filesList.clear();
     m_future.waitForFinished();
     frame_list->clear();
@@ -453,12 +610,12 @@ void StopmotionWidget::sequenceNameChanged(const QString& name)
         m_sequenceFrame = m_filesList.isEmpty() ? 0 : SlideshowClip::getFrameNumberFromPath(m_filesList.last()) + 1;
         if (!m_filesList.isEmpty()) {
             m_sequenceName = sequence_name->currentText();
-            connect(this, SIGNAL(doCreateThumbs(QImage, int)), this, SLOT(slotCreateThumbs(QImage, int)));
+            connect(this, SIGNAL(doCreateThumbs(QImage,int)), this, SLOT(slotCreateThumbs(QImage,int)));
             m_future = QtConcurrent::run(this, &StopmotionWidget::slotPrepareThumbs);
             button_addsequence->setEnabled(true);
         } else {
             // new sequence
-            connect(this, SIGNAL(doCreateThumbs(QImage, int)), this, SLOT(slotCreateThumbs(QImage, int)));
+            connect(this, SIGNAL(doCreateThumbs(QImage,int)), this, SLOT(slotCreateThumbs(QImage,int)));
             button_addsequence->setEnabled(false);
         }
         capture_button->setEnabled(live_button->isChecked());
@@ -467,7 +624,7 @@ void StopmotionWidget::sequenceNameChanged(const QString& name)
 
 void StopmotionWidget::slotCaptureFrame()
 {
-    if (m_bmCapture == NULL) return;
+    if (m_captureDevice == NULL) return;
     if (sequence_name->currentText().isEmpty()) {
         QString seqName = QInputDialog::getText(this, i18n("Create New Sequence"), i18n("Enter sequence name"));
         if (seqName.isEmpty()) {
@@ -489,7 +646,7 @@ void StopmotionWidget::slotCaptureFrame()
         return;
     }
     QString currentPath = getPathForFrame(m_sequenceFrame);
-    m_bmCapture->captureFrame(currentPath);
+    m_captureDevice->captureFrame(currentPath);
     KNotification::event("FrameCaptured", i18n("Frame Captured"), QPixmap(), this);
     m_sequenceFrame++;
     button_addsequence->setEnabled(true);
@@ -506,12 +663,13 @@ void StopmotionWidget::slotPreNotify()
 }
 
 
-void StopmotionWidget::slotNewThumb(const QString path)
+void StopmotionWidget::slotNewThumb(const QString &path)
 {
     if (!KdenliveSettings::showstopmotionthumbs()) return;
     m_filesList.append(path);
-    if (m_showOverlay->isChecked()) slotUpdateOverlay();
+    if (m_showOverlay->isChecked()) reloadOverlay();
     if (!m_future.isRunning()) m_future = QtConcurrent::run(this, &StopmotionWidget::slotPrepareThumbs);
+
 }
 
 void StopmotionWidget::slotPrepareThumbs()
@@ -522,7 +680,7 @@ void StopmotionWidget::slotPrepareThumbs()
 
 }
 
-void StopmotionWidget::slotCreateThumbs(QImage img, int ix)
+void StopmotionWidget::slotCreateThumbs(const QImage &img, int ix)
 {
     if (img.isNull()) {
         m_future = QtConcurrent::run(this, &StopmotionWidget::slotPrepareThumbs);
@@ -551,8 +709,9 @@ void StopmotionWidget::slotCreateThumbs(QImage img, int ix)
 
 QString StopmotionWidget::getPathForFrame(int ix, QString seqName)
 {
-    if (seqName.isEmpty()) seqName = m_sequenceName;
-    return m_projectFolder.path(KUrl::AddTrailingSlash) + seqName + "_" + QString::number(ix).rightJustified(4, '0', false) + ".png";
+    if (seqName.isEmpty())
+        seqName = m_sequenceName;
+    return m_projectFolder.path(KUrl::AddTrailingSlash) + seqName + QLatin1Char('_') + QString::number(ix).rightJustified(4, '0', false) + QLatin1String(".png");
 }
 
 void StopmotionWidget::slotShowFrame(const QString& path)
@@ -562,7 +721,6 @@ void StopmotionWidget::slotShowFrame(const QString& path)
     capture_button->setEnabled(false);
     slotLive(false);
     if (!img.isNull()) {
-        if (m_bmCapture) m_bmCapture->hidePreview(true);
         m_frame_preview->setImage(img);
         m_frame_preview->setHidden(false);
         m_frame_preview->update();
@@ -680,7 +838,8 @@ void StopmotionWidget::selectFrame(int ix)
 {
     frame_list->blockSignals(true);
     QListWidgetItem* item = getFrameFromIndex(ix);
-    if (!item) return;
+    if (!item)
+        return;
     frame_list->setCurrentItem(item);
     frame_list->blockSignals(false);
 }
@@ -697,7 +856,9 @@ void StopmotionWidget::slotRemoveFrame()
 {
     if (frame_list->currentItem() == NULL) return;
     QString path = frame_list->currentItem()->toolTip();
-    if (KMessageBox::questionYesNo(this, i18n("Delete frame %1 from disk?", path), i18n("Delete Frame")) != KMessageBox::Yes) return;
+    if (KMessageBox::questionYesNo(this, i18n("Delete frame %1 from disk?", path), i18n("Delete Frame")) != KMessageBox::Yes)
+        return;
+
     QFile f(path);
     if (f.remove()) {
         QListWidgetItem* item = frame_list->takeItem(frame_list->currentRow());
@@ -714,7 +875,39 @@ void StopmotionWidget::slotRemoveFrame()
 void StopmotionWidget::slotSwitchAnalyse(bool isOn)
 {
     KdenliveSettings::setAnalyse_stopmotion(isOn);
-    m_bmCapture->setAnalyse(isOn);
+    if (m_captureDevice) m_captureDevice->sendFrameForAnalysis = isOn;
 }
 
+void StopmotionWidget::slotSwitchMirror(bool isOn)
+{
+    //KdenliveSettings::setAnalyse_stopmotion(isOn);
+    if (m_captureDevice)
+        m_captureDevice->mirror(isOn);
+}
+
+
+const QString StopmotionWidget::createProducer(const MltVideoProfile &profile, const QString &service, const QString &resource)
+{
+    Q_UNUSED(profile)
+
+    QString playlist = "<mlt title=\"capture\"><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\">" + resource + "</property><property name=\"mlt_service\">" + service + "</property></producer>";
+
+    // overlay track
+    playlist.append("<playlist id=\"playlist0\"></playlist>");
+
+    // video4linux track
+    playlist.append("<playlist id=\"playlist1\"><entry producer=\"producer0\" in=\"0\" out=\"99999\"/></playlist>");
+
+    playlist.append("<tractor id=\"tractor0\" title=\"video0\" global_feed=\"1\" in=\"0\" out=\"99999\">");
+    playlist.append("<track producer=\"playlist0\"/>");
+    playlist.append("<track producer=\"playlist1\"/>");
+    playlist.append("</tractor></mlt>");
+
+
+    return playlist;
+}
+
+
+
 
+#include "stopmotion.moc"