- Cleanup argument parsing in kdenlive_render

- Invert level shown in zoom slider tooltip

svn path=/trunk/kdenlive/; revision=4452

diff --git a/renderer/kdenlive_render.cpp b/renderer/kdenlive_render.cpp
index d84f11b3922dfabb6b05f165e5b3d5ddbabc0499..a577e2069d89dd8bd564d1f71c586e1da59d2348 100644 (file)
--- a/renderer/kdenlive_render.cpp
+++ b/renderer/kdenlive_render.cpp
@@ -32,43 +32,33 @@ int main(int argc, char **argv)
     QStringList preargs;
     int in = -1;
     int out = -1;
-    if (!args.isEmpty()) args.takeFirst();
-    if (args.count() >= 4) {
+    if (args.count() >= 7) {
+        // Remove program name
+        args.removeFirst();
+        
         bool erase = false;
         if (args.at(0) == "-erase") {
             erase = true;
-            args.takeFirst();
+            args.removeFirst();
         }
         bool usekuiserver = false;
         if (args.at(0) == "-kuiserver") {
             usekuiserver = true;
-            args.takeFirst();
+            args.removeFirst();
         }
-        if (args.at(0).startsWith("in=")) {
-            in = args.at(0).section('=', -1).toInt();
-            args.takeFirst();
-        }
-        if (args.at(0).startsWith("out=")) {
-            out = args.at(0).section('=', -1).toInt();
-            args.takeFirst();
-        }
-        if (args.at(0).startsWith("preargs=")) {
-            QString a = args.at(0).section('=', 1);
-            preargs = a.split(' ', QString::SkipEmptyParts);
-            args.takeFirst();
-        }
-        QString render = args.at(0);
-        args.takeFirst();
-        QString profile = args.at(0);
-        args.takeFirst();
-        QString rendermodule = args.at(0);
-        args.takeFirst();
-        QString player = args.at(0);
-        args.takeFirst();
-        QString src = args.at(0);
-        args.takeFirst();
-        QString dest = args.at(0);
-        args.takeFirst();
+        if (args.at(0).startsWith("in="))
+            in = args.takeFirst().section('=', -1).toInt();
+        if (args.at(0).startsWith("out="))
+            out = args.takeFirst().section('=', -1).toInt();
+        if (args.at(0).startsWith("preargs="))
+            preargs = args.takeFirst().section('=', 1).split(' ', QString::SkipEmptyParts);
+
+        QString render = args.takeFirst();
+        QString profile = args.takeFirst();
+        QString rendermodule = args.takeFirst();
+        QString player = args.takeFirst();
+        QString src = args.takeFirst();
+        QString dest = args.takeFirst();
         bool dualpass = false;
         bool doerase;
         if (args.contains("pass=2")) {

diff --git a/renderer/renderjob.h b/renderer/renderjob.h
index d62d3952b362f394d053fc7a511fc364ce5d318a..f3b4e35d7f1e4312bebe90c0233d46b2ed16d422 100644 (file)
--- a/renderer/renderjob.h
+++ b/renderer/renderjob.h
@@ -65,9 +65,9 @@ private:
     void initKdenliveDbusInterface();
     bool m_usekuiserver;
     bool m_enablelog;
-    /** \brief Used to create a temporary file for logging */
+    /** @brief Used to create a temporary file for logging. */
     QTemporaryFile m_logfile;
-    /** \brief Used to write to the log file */
+    /** @brief Used to write to the log file. */
     QTextStream m_logstream;
 
 signals:

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 0bbebd820a9168025f2f0b613f3ee0237d0ecf92..e9f1106ee8ea1ce62143d8dcb16c199772591df9 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -663,7 +663,6 @@ void MainWindow::slotUpdateClip(const QString &id)
 
 void MainWindow::slotConnectMonitors()
 {
-
     m_projectList->setRenderer(m_projectMonitor->render);
     //connect(m_projectList, SIGNAL(receivedClipDuration(const QString &)), this, SLOT(slotUpdateClip(const QString &)));
     connect(m_projectList, SIGNAL(deleteProjectClips(QStringList, QMap<QString, QString>)), this, SLOT(slotDeleteProjectClips(QStringList, QMap<QString, QString>)));
@@ -2596,7 +2595,7 @@ void MainWindow::slotShowZoomSliderToolTip(int zoomlevel)
 
 void MainWindow::slotUpdateZoomSliderToolTip(int zoomlevel)
 {
-    m_zoomSlider->setToolTip(i18n("Zoom Level: %1/13", zoomlevel));
+    m_zoomSlider->setToolTip(i18n("Zoom Level: %1/13", (13 - zoomlevel)));
 }
 
 void MainWindow::slotGotProgressInfo(const QString &message, int progress)