Adding m2v and ac3 as supported mimetypes:

[kdenlive] / src / wizard.cpp

diff --git a/src/wizard.cpp b/src/wizard.cpp
index 39e3708d7eadb93ab1076a6a86b50f481e4a43c5..9b451084be3674ff744aeae5baaf9ffe05789e6a 100644 (file)
--- a/src/wizard.cpp
+++ b/src/wizard.cpp
@@ -20,10 +20,11 @@
 #include "wizard.h"
 #include "kdenlivesettings.h"
 #include "profilesdialog.h"
+#include "renderer.h"
 #ifdef USE_V4L
 #include "v4l/v4lcapture.h"
 #endif
-#include "kdenlive-config.h"
+#include "config-kdenlive.h"
 
 #include <mlt++/Mlt.h>
 #include <framework/mlt_version.h>
@@ -43,8 +44,8 @@
 
 // Recommended MLT version
 const int mltVersionMajor = 0;
-const int mltVersionMinor = 7;
-const int mltVersionRevision = 6;
+const int mltVersionMinor = 8;
+const int mltVersionRevision = 0;
 
 static const char kdenlive_version[] = VERSION;
 
@@ -135,8 +136,13 @@ Wizard::Wizard(bool upgrade, QWidget *parent) :
 
 #ifndef Q_WS_MAC
     QWizardPage *page6 = new QWizardPage;
-    page6->setTitle(i18n("Webcam"));
+    page6->setTitle(i18n("Capture device"));
     m_capture.setupUi(page6);
+    bool found_decklink = Render::getBlackMagicDeviceList(m_capture.decklink_devices);
+    KdenliveSettings::setDecklink_device_found(found_decklink);
+    if (found_decklink) m_capture.decklink_status->setText(i18n("Default Blackmagic Decklink card:"));
+    else m_capture.decklink_status->setText(i18n("No Blackmagic Decklink device found"));
+    connect(m_capture.decklink_devices, SIGNAL(currentIndexChanged(int)), this, SLOT(slotUpdateDecklinkDevice(int)));
     connect(m_capture.button_reload, SIGNAL(clicked()), this, SLOT(slotDetectWebcam()));
     connect(m_capture.v4l_devices, SIGNAL(currentIndexChanged(int)), this, SLOT(slotUpdateCaptureParameters()));
     connect(m_capture.v4l_formats, SIGNAL(currentIndexChanged(int)), this, SLOT(slotSaveCaptureFormat()));
@@ -174,7 +180,7 @@ void Wizard::slotDetectWebcam()
         }
     }
     if (m_capture.v4l_devices->count() > 0) {
-        m_capture.v4l_status->setText(i18n("Select your default video4linux device"));
+        m_capture.v4l_status->setText(i18n("Default video4linux device:"));
         // select default device
         bool found = false;
         for (int i = 0; i < m_capture.v4l_devices->count(); i++) {
@@ -207,19 +213,19 @@ void Wizard::slotUpdateCaptureParameters()
         MltVideoProfile profileInfo = ProfilesDialog::getVideoProfile(vl4ProfilePath);
         m_capture.v4l_formats->addItem(i18n("Current settings (%1x%2, %3/%4fps)", profileInfo.width, profileInfo.height, profileInfo.frame_rate_num, profileInfo.frame_rate_den), QStringList() << QString("unknown") <<QString::number(profileInfo.width)<<QString::number(profileInfo.height)<<QString::number(profileInfo.frame_rate_num)<<QString::number(profileInfo.frame_rate_den));
     }
-    QStringList pixelformats = formats.split(">", QString::SkipEmptyParts);
+    QStringList pixelformats = formats.split('>', QString::SkipEmptyParts);
     QString itemSize;
     QString pixelFormat;
     QStringList itemRates;
     for (int i = 0; i < pixelformats.count(); i++) {
         QString format = pixelformats.at(i).section(':', 0, 0);
-        QStringList sizes = pixelformats.at(i).split(":", QString::SkipEmptyParts);
+        QStringList sizes = pixelformats.at(i).split(':', QString::SkipEmptyParts);
         pixelFormat = sizes.takeFirst();
         for (int j = 0; j < sizes.count(); j++) {
-            itemSize = sizes.at(j).section("=", 0, 0);
-            itemRates = sizes.at(j).section("=", 1, 1).split(",", QString::SkipEmptyParts);
+            itemSize = sizes.at(j).section('=', 0, 0);
+            itemRates = sizes.at(j).section('=', 1, 1).split(',', QString::SkipEmptyParts);
             for (int k = 0; k < itemRates.count(); k++) {
-                QString formatDescription = "[" + format + "] " + itemSize + " (" + itemRates.at(k) + ")";
+                QString formatDescription = '[' + format + "] " + itemSize + " (" + itemRates.at(k) + ')';
                 if (m_capture.v4l_formats->findText(formatDescription) == -1)
                     m_capture.v4l_formats->addItem(formatDescription, QStringList() << format << itemSize.section('x', 0, 0) << itemSize.section('x', 1, 1) << itemRates.at(k).section('/', 0, 0) << itemRates.at(k).section('/', 1, 1));
             }
@@ -600,7 +606,7 @@ void Wizard::adjustSettings()
 {
     if (m_extra.installmimes->isChecked()) {
         QStringList globs;
-        globs << "*.mts" << "*.m2t" << "*.mod" << "*.ts" << "*.m2ts";
+        globs << "*.mts" << "*.m2t" << "*.mod" << "*.ts" << "*.m2ts" << "*.m2v";
         installExtraMimes("video/mpeg", globs);
         globs.clear();
         globs << "*.dv";
@@ -676,4 +682,9 @@ void Wizard::slotSaveCaptureFormat()
     ProfilesDialog::saveProfile(profile, vl4ProfilePath);
 }
 
+void Wizard::slotUpdateDecklinkDevice(int captureCard)
+{
+    KdenliveSettings::setDecklink_capturedevice(captureCard);
+}
+
 #include "wizard.moc"