Fix icludes

[kdenlive] / renderer / kdenlive_render.cpp

diff --git a/renderer/kdenlive_render.cpp b/renderer/kdenlive_render.cpp
index 07cb3f82f07889378eb563ff3071cfaceeda72c3..079420b120b42f37aabea8f59f1ed2a8c2324859 100644 (file)
--- a/renderer/kdenlive_render.cpp
+++ b/renderer/kdenlive_render.cpp
@@ -22,8 +22,7 @@
 #include <QStringList>
 #include <QString>
 #include <QUrl>
-#include <QtDebug>
-
+#include <QDebug>
 #include "renderjob.h"
 
 int main(int argc, char **argv)
@@ -69,8 +68,12 @@ int main(int argc, char **argv)
         QString profile = args.takeFirst();
         QString rendermodule = args.takeFirst();
         QString player = args.takeFirst();
-       QUrl srcurl = QUrl::fromEncoded(args.takeFirst().toUtf8());
+        QByteArray srcString = args.takeFirst().toUtf8();
+        QUrl srcurl = QUrl::fromEncoded(srcString);
         QString src = srcurl.path();
+        // The QUrl path() strips the consumer: protocol, so re-add it if necessary
+        if (srcString.startsWith("consumer:"))
+            src.prepend("consumer:");
         QUrl desturl = QUrl::fromEncoded(args.takeFirst().toUtf8());
         QString dest = desturl.path();
         bool dualpass = false;
@@ -81,7 +84,7 @@ int main(int argc, char **argv)
         if (vprepos >= 0) {
             vpre=args.at(vprepos);
         }
-        QStringList vprelist = vpre.replace("vpre=", "").split(",");
+        QStringList vprelist = vpre.replace("vpre=", "").split(',');
         if (vprelist.size() > 0) {
             args.replaceInStrings(QRegExp("^vpre=.*"), QString("vpre=").append(vprelist.at(0)));
         }
@@ -96,6 +99,14 @@ int main(int argc, char **argv)
             args.removeAll("pass=1");
             doerase = erase;
         }
+        
+        // Decode metadata
+        for (int i = 0; i < args.count(); ++i) {
+            if (args.at(i).startsWith("meta.attr")) {
+                QString data = args.at(i);
+                args.replace(i, data.section('=', 0, 0) + "=\"" + QUrl::fromPercentEncoding(data.section('=', 1).toUtf8()) + "\"");
+            }
+        }
 
         qDebug() << "//STARTING RENDERING: " << erase << "," << usekuiserver << "," << render << "," << profile << "," << rendermodule << "," << player << "," << src << "," << dest << "," << preargs << "," << args << "," << in << "," << out ;
         RenderJob *job = new RenderJob(doerase, usekuiserver, pid, render, profile, rendermodule, player, src, dest, preargs, args, in, out);