Const'ref

[kdenlive] / plugins / sampleplugin / sampleplugin.cpp

diff --git a/plugins/sampleplugin/sampleplugin.cpp b/plugins/sampleplugin/sampleplugin.cpp
index be61870852c30b7b563d9829b7895ebdda33e7e5..e369548ed0c3ddf0669fee5867d304aa2e4f5ab6 100644 (file)
--- a/plugins/sampleplugin/sampleplugin.cpp
+++ b/plugins/sampleplugin/sampleplugin.cpp
@@ -25,74 +25,101 @@
 #include <KIntSpinBox>
 #include <KDebug>
 #include <KMessageBox>
+#include <KApplication>
 
 #include <QDialog>
 #include <QDomDocument>
 #include <QInputDialog>
+#include <QProcess>
 
-QStringList SamplePlugin::generators() const {
-    return QStringList() << i18n("Countdown") << i18n("Noise");
+QStringList SamplePlugin::generators(const QStringList &producers) const
+{
+    QStringList result;
+    if (producers.contains("pango")) result << i18n("Countdown");
+    if (producers.contains("noise")) result << i18n("Noise");
+    return result;
 }
 
 
-KUrl SamplePlugin::generatedClip(const QString &generator, const KUrl &projectFolder, const QStringList &/*lumaNames*/, const QStringList &/*lumaFiles*/, const double fps, const int /*width*/, const int /*height*/) {
+KUrl SamplePlugin::generatedClip(const QString &renderer, const QString &generator, const KUrl &projectFolder, const QStringList &/*lumaNames*/, const QStringList &/*lumaFiles*/, const double fps, const int /*width*/, const int height)
+{
     QString prePath;
     if (generator == i18n("Noise")) {
         prePath = projectFolder.path() + "/noise";
     } else prePath = projectFolder.path() + "/counter";
     int ct = 0;
     QString counter = QString::number(ct).rightJustified(5, '0', false);
-    while (QFile::exists(prePath + counter + ".westley")) {
+    while (QFile::exists(prePath + counter + ".mlt")) {
         ct++;
         counter = QString::number(ct).rightJustified(5, '0', false);
     }
-    QDialog d;
-    if (generator == i18n("Noise")) d.setWindowTitle(tr("Create Noise Clip"));
-    else d.setWindowTitle(tr("Create Countdown Clip"));
+    QPointer<QDialog> d = new QDialog;
     Ui::CountDown_UI view;
-    view.setupUi(&d);
-    QString clipFile = prePath + counter + ".westley";
-    view.path->setPath(clipFile);
-    if (d.exec() == QDialog::Accepted) {
-        QDomDocument doc;
-        QDomElement westley = doc.createElement("westley");
-        QDomElement playlist = doc.createElement("playlist");
+    view.setupUi(d);
+    if (generator == i18n("Noise")) {
+        d->setWindowTitle(i18n("Create Noise Clip"));
+        view.font_label->setHidden(true);
+        view.font->setHidden(true);
+    } else {
+        d->setWindowTitle(i18n("Create Countdown Clip"));
+        view.font->setValue(height);
+    }
+
+    // Set single file mode. Default seems to be File::ExistingOnly.
+    view.path->setMode(KFile::File);
+
+    QString clipFile = prePath + counter + ".mlt";
+    view.path->setUrl(KUrl(clipFile));
+    KUrl result;
+    
+    if (d->exec() == QDialog::Accepted) {
+        QProcess generatorProcess;
+
+        // Disable VDPAU so that rendering will work even if there is a Kdenlive instance using VDPAU
+#if QT_VERSION >= 0x040600
+        QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+        env.insert("MLT_NO_VDPAU", "1");
+        generatorProcess.setProcessEnvironment(env);
+#else
+        QStringList env = QProcess::systemEnvironment();
+        env << "MLT_NO_VDPAU=1";
+        generatorProcess.setEnvironment(env);
+#endif
+        QStringList args;
         if (generator == i18n("Noise")) {
-            QDomElement prod = doc.createElement("producer");
-            prod.setAttribute("mlt_service", "noise");
-            prod.setAttribute("in", "0");
-            prod.setAttribute("out", QString::number((int) fps * view.duration->value()));
-            playlist.appendChild(prod);
-        } else {
+            args << "noise:" << "in=0" << QString("out=" + QString::number((int) fps * view.duration->value()));
+        }
+        else {
+            // Countdown producer
             for (int i = 0; i < view.duration->value(); i++) {
                 // Create the producers
-                QDomElement prod = doc.createElement("producer");
-                prod.setAttribute("mlt_service", "pango");
-                prod.setAttribute("in", "0");
-                prod.setAttribute("out", QString::number((int) fps));
-                prod.setAttribute("markup", QString::number(view.duration->value() - i));
-                playlist.appendChild(prod);
+                args << "pango:" << "in=0" << QString("out=" + QString::number((int) fps * view.duration->value()));
+                args << QString("text=" + QString::number(view.duration->value() - i));
+                args << QString("font=" + QString::number(view.font->value()) + "px");
             }
         }
-        westley.appendChild(playlist);
-        doc.appendChild(westley);
-        QFile file(view.path->url().path());
-        if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
-            kWarning() << "//////  ERROR writing to file: " << view.path->url().path();
-            KMessageBox::error(0, i18n("Cannot write to file %1", view.path->url().path()));
-            return KUrl();
-        }
-        QTextStream out(&file);
-        out << doc.toString();
-        if (file.error() != QFile::NoError) {
-            KMessageBox::error(0, i18n("Cannot write to file %1", view.path->url().path()));
-            file.close();
-            return KUrl();
+
+        args << "-consumer"<<QString("xml:%1").arg(view.path->url().path());
+        generatorProcess.start(renderer, args);
+        if (generatorProcess.waitForFinished()) {
+            if (generatorProcess.exitStatus() == QProcess::CrashExit) {
+                kDebug() << "/// Generator failed: ";
+                QString error = generatorProcess.readAllStandardError();
+                KMessageBox::sorry(kapp->activeWindow(), i18n("Failed to generate clip:\n%1", error, i18n("Generator Failed")));
+            }
+            else {
+                result = view.path->url();
+            }
+        } else {
+            kDebug() << "/// Generator failed: ";
+            QString error = generatorProcess.readAllStandardError();
+            KMessageBox::sorry(kapp->activeWindow(), i18n("Failed to generate clip:\n%1", error, i18n("Generator Failed")));
         }
-        file.close();
-        return view.path->url();
     }
-    return KUrl();
+    delete d;
+    return result;
 }
 
 Q_EXPORT_PLUGIN2(kdenlive_sampleplugin, SamplePlugin)
+
+#include "sampleplugin.moc"