Sequential rendering (one job after another)

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

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index c96c644c6fe1ada14584612fdd2de188f23c39af..8161941e18988ae2c5eb2c8cd0f2c00f8bc9be14 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1542,7 +1542,7 @@ void MainWindow::slotRenderProject()
     if (!m_renderWidget) {
         QString projectfolder = m_activeDocument ? m_activeDocument->projectFolder().path() : KdenliveSettings::defaultprojectfolder();
         m_renderWidget = new RenderWidget(projectfolder, this);
-        connect(m_renderWidget, SIGNAL(doRender(const QString&, const QString&, const QStringList &, const QStringList &, bool, bool, double, double, bool, const QString &)), this, SLOT(slotDoRender(const QString&, const QString&, const QStringList &, const QStringList &, bool, bool, double, double, bool, const QString &)));
+        connect(m_renderWidget, SIGNAL(doRender(const QStringList&, const QStringList&)), this, SLOT(slotDoRender(const QStringList&, const QStringList&)));
         connect(m_renderWidget, SIGNAL(abortProcess(const QString &)), this, SIGNAL(abortRenderJob(const QString &)));
         connect(m_renderWidget, SIGNAL(openDvdWizard(const QString &, const QString &)), this, SLOT(slotDvdWizard(const QString &, const QString &)));
         if (m_activeDocument) {
@@ -1556,9 +1556,18 @@ void MainWindow::slotRenderProject()
     m_renderWidget->show();
 }
 
-void MainWindow::slotDoRender(const QString &dest, const QString &render, const QStringList &overlay_args, const QStringList &avformat_args, bool zoneOnly, bool playAfter, double guideStart, double guideEnd, bool resizeProfile, const QString &scriptExport)
+void MainWindow::slotDoRender(const QStringList args, const QStringList overlay_args)
 {
-    kDebug() << "// SCRIPT EXPORT: " << scriptExport;
+    QString dest = args.at(0);
+    QString render = args.at(1);
+    QStringList avformat_args = args.at(2).split(' ');
+    bool zoneOnly = args.at(3).toInt();
+    bool playAfter = args.at(4).toInt();
+    double guideStart = args.at(5).toDouble();
+    double guideEnd = args.at(6).toDouble();
+    bool resizeProfile = args.at(7).toInt();
+    QString scriptExport = args.at(8);
+
     if (dest.isEmpty()) return;
     int in = 0;
     int out = 0;

diff --git a/src/mainwindow.h b/src/mainwindow.h
index 510280c6ac195222490335108af1794472d3a53a..0d7d846fdf20b8c11ca5f60d429e2dd4b87fe390 100644 (file)
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -224,7 +224,7 @@ private slots:
     void slotSwitchMarkersComments();
     void slotSwitchSnap();
     void slotRenderProject();
-    void slotDoRender(const QString &dest, const QString &render, const QStringList &overlay_args, const QStringList &avformat_args, bool zoneOnly, bool playAfter, double guideStart, double guideEnd, bool resizeProfile, const QString &scriptExport);
+    void slotDoRender(const QStringList args, const QStringList overlay_args);
     void slotFullScreen();
     void slotUpdateDocumentState(bool modified);
     void slotZoomIn();

diff --git a/src/renderwidget.cpp b/src/renderwidget.cpp
index 384facbee3a405ebbce1f0c6c02732390c838a72..fe582db823dc92e95e0fc039ad7378f867925d2f 100644 (file)
--- a/src/renderwidget.cpp
+++ b/src/renderwidget.cpp
@@ -48,6 +48,12 @@ const int EditableRole = GroupRole + 5;
 const int MetaGroupRole = GroupRole + 6;
 const int ExtraRole = GroupRole + 7;
 
+// Running job status
+const int WAITINGJOB = 0;
+const int RUNNINGJOB = 1;
+const int FINISHEDJOB = 2;
+
+
 RenderWidget::RenderWidget(const QString &projectfolder, QWidget * parent) :
         QDialog(parent),
         m_projectFolder(projectfolder)
@@ -66,6 +72,7 @@ RenderWidget::RenderWidget(const QString &projectfolder, QWidget * parent) :
     m_view.buttonSave->setToolTip(i18n("Create new profile"));
 
     m_view.buttonInfo->setIcon(KIcon("help-about"));
+    m_view.hide_log->setIcon(KIcon("go-down"));
 
     if (KdenliveSettings::showrenderparams()) {
         m_view.buttonInfo->setDown(true);
@@ -97,8 +104,8 @@ RenderWidget::RenderWidget(const QString &projectfolder, QWidget * parent) :
 
     connect(m_view.start_script, SIGNAL(clicked()), this, SLOT(slotStartScript()));
     connect(m_view.delete_script, SIGNAL(clicked()), this, SLOT(slotDeleteScript()));
-    connect(m_view.scripts_list, SIGNAL(itemClicked(QTreeWidgetItem *, int)), this, SLOT(slotCheckScript()));
-    connect(m_view.running_jobs, SIGNAL(itemClicked(QTreeWidgetItem *, int)), this, SLOT(slotCheckJob()));
+    connect(m_view.scripts_list, SIGNAL(itemSelectionChanged()), this, SLOT(slotCheckScript()));
+    connect(m_view.running_jobs, SIGNAL(itemSelectionChanged()), this, SLOT(slotCheckJob()));
 
     connect(m_view.buttonInfo, SIGNAL(clicked()), this, SLOT(showInfoPanel()));
 
@@ -106,6 +113,9 @@ RenderWidget::RenderWidget(const QString &projectfolder, QWidget * parent) :
     connect(m_view.buttonEdit, SIGNAL(clicked()), this, SLOT(slotEditProfile()));
     connect(m_view.buttonDelete, SIGNAL(clicked()), this, SLOT(slotDeleteProfile()));
     connect(m_view.abort_job, SIGNAL(clicked()), this, SLOT(slotAbortCurrentJob()));
+    connect(m_view.clean_up, SIGNAL(clicked()), this, SLOT(slotCLeanUpJobs()));
+    connect(m_view.hide_log, SIGNAL(clicked()), this, SLOT(slotHideLog()));
+
     connect(m_view.buttonClose, SIGNAL(clicked()), this, SLOT(hide()));
     connect(m_view.buttonClose2, SIGNAL(clicked()), this, SLOT(hide()));
     connect(m_view.buttonClose3, SIGNAL(clicked()), this, SLOT(hide()));
@@ -641,10 +651,27 @@ void RenderWidget::slotExport(bool scriptExport)
     // insert item in running jobs list
     QTreeWidgetItem *renderItem;
     QList<QTreeWidgetItem *> existing = m_view.running_jobs->findItems(dest, Qt::MatchExactly, 1);
-    if (!existing.isEmpty()) renderItem = existing.at(0);
-    else renderItem = new QTreeWidgetItem(m_view.running_jobs, QStringList() << QString() << dest << QString());
+    if (!existing.isEmpty()) {
+        renderItem = existing.at(0);
+        if (renderItem->data(1, Qt::UserRole + 2).toInt() == RUNNINGJOB) {
+            KMessageBox::information(this, i18n("There is already a job writing file:<br><b>%1</b><br>Abort the job if you want to overwrite it...", dest), i18n("Already running"));
+            return;
+        }
+    } else {
+        renderItem = new QTreeWidgetItem(m_view.running_jobs, QStringList() << QString() << dest << QString());
+        renderItem->setData(1, Qt::UserRole + 2, WAITINGJOB);
+        renderItem->setIcon(0, KIcon("media-playback-pause"));
+        renderItem->setData(1, Qt::UserRole, i18n("Waiting..."));
+    }
     renderItem->setSizeHint(1, QSize(m_view.running_jobs->columnWidth(1), fontMetrics().height() * 2));
     renderItem->setData(1, Qt::UserRole + 1, QTime::currentTime());
+    renderItem->setData(1, Qt::UserRole + 2, overlayargs);
+    QStringList renderParameters;
+    renderParameters << dest << item->data(RenderRole).toString() << renderArgs.simplified();
+    renderParameters << QString::number(m_view.render_zone->isChecked()) << QString::number(m_view.play_after->isChecked());
+    renderParameters << QString::number(startPos) << QString::number(endPos) << QString::number(resizeProfile);
+    renderParameters << scriptName;
+    renderItem->setData(1, Qt::UserRole + 3, renderParameters);
 
     // Set rendering type
     QString group = m_view.size_list->currentItem()->data(MetaGroupRole).toString();
@@ -664,7 +691,7 @@ void RenderWidget::slotExport(bool scriptExport)
         renderItem->setData(0, Qt::UserRole + 1, url);
     }
 
-    emit doRender(dest, item->data(RenderRole).toString(), overlayargs, renderArgs.simplified().split(' '), m_view.render_zone->isChecked(), m_view.play_after->isChecked(), startPos, endPos, resizeProfile, scriptName);
+    checkRenderStatus();
     if (scriptName.isEmpty()) m_view.tabWidget->setCurrentIndex(1);
     else {
         QTimer::singleShot(400, this, SLOT(parseScriptFiles()));
@@ -672,6 +699,22 @@ void RenderWidget::slotExport(bool scriptExport)
     }
 }
 
+void RenderWidget::checkRenderStatus()
+{
+    QTreeWidgetItem *item = m_view.running_jobs->topLevelItem(0);
+    while (item) {
+        if (item->data(1, Qt::UserRole + 2).toInt() == RUNNINGJOB) break;
+        else if (item->data(1, Qt::UserRole + 2).toInt() == WAITINGJOB) {
+            item->setData(1, Qt::UserRole + 1, QTime::currentTime());
+            if (item->data(1, Qt::UserRole + 4).isNull())
+                emit doRender(item->data(1, Qt::UserRole + 3).toStringList(), item->data(1, Qt::UserRole + 2).toStringList());
+            else QProcess::startDetached(item->data(1, Qt::UserRole + 3).toString());
+            break;
+        }
+        item = m_view.running_jobs->itemBelow(item);
+    }
+}
+
 void RenderWidget::setProfile(MltVideoProfile profile)
 {
     m_profile = profile;
@@ -1114,8 +1157,17 @@ void RenderWidget::setRenderJob(const QString &dest, int progress)
     QTreeWidgetItem *item;
     QList<QTreeWidgetItem *> existing = m_view.running_jobs->findItems(dest, Qt::MatchExactly, 1);
     if (!existing.isEmpty()) item = existing.at(0);
-    else item = new QTreeWidgetItem(m_view.running_jobs, QStringList() << QString() << dest << QString());
+    else {
+        item = new QTreeWidgetItem(m_view.running_jobs, QStringList() << QString() << dest << QString());
+        item->setSizeHint(1, QSize(m_view.running_jobs->columnWidth(1), fontMetrics().height() * 2));
+        if (progress == 0) {
+            item->setData(1, Qt::UserRole + 2, WAITINGJOB);
+            item->setIcon(0, KIcon("media-playback-pause"));
+            item->setData(1, Qt::UserRole, i18n("Waiting..."));
+        }
+    }
     item->setData(2, Qt::UserRole, progress);
+    item->setData(1, Qt::UserRole + 2, RUNNINGJOB);
     if (progress == 0) {
         item->setIcon(0, KIcon("system-run"));
         item->setSizeHint(1, QSize(m_view.running_jobs->columnWidth(1), fontMetrics().height() * 2));
@@ -1134,7 +1186,11 @@ void RenderWidget::setRenderStatus(const QString &dest, int status, const QStrin
     QTreeWidgetItem *item;
     QList<QTreeWidgetItem *> existing = m_view.running_jobs->findItems(dest, Qt::MatchExactly, 1);
     if (!existing.isEmpty()) item = existing.at(0);
-    else item = new QTreeWidgetItem(m_view.running_jobs, QStringList() << QString() << dest << QString());
+    else {
+        item = new QTreeWidgetItem(m_view.running_jobs, QStringList() << QString() << dest << QString());
+        item->setSizeHint(1, QSize(m_view.running_jobs->columnWidth(1), fontMetrics().height() * 2));
+    }
+    item->setData(1, Qt::UserRole + 2, FINISHEDJOB);
     if (status == -1) {
         // Job finished successfully
         item->setIcon(0, KIcon("dialog-ok"));
@@ -1167,12 +1223,20 @@ void RenderWidget::setRenderStatus(const QString &dest, int status, const QStrin
         item->setData(2, Qt::UserRole, 100);
     }
     slotCheckJob();
+    checkRenderStatus();
 }
 
 void RenderWidget::slotAbortCurrentJob()
 {
     QTreeWidgetItem *current = m_view.running_jobs->currentItem();
-    if (current) emit abortProcess(current->text(1));
+    if (current) {
+        if (current->data(1, Qt::UserRole + 2).toInt() == RUNNINGJOB)
+            emit abortProcess(current->text(1));
+        else {
+            delete current;
+            slotCheckJob();
+        }
+    }
 }
 
 void RenderWidget::slotCheckJob()
@@ -1180,12 +1244,27 @@ void RenderWidget::slotCheckJob()
     bool activate = false;
     QTreeWidgetItem *current = m_view.running_jobs->currentItem();
     if (current) {
-        int percent = current->data(2, Qt::UserRole).toInt();
-        if (percent < 100) activate = true;
+        if (current->data(1, Qt::UserRole + 2).toInt() == RUNNINGJOB)
+            m_view.abort_job->setText(i18n("Abort Job"));
+        else m_view.abort_job->setText(i18n("Remove Job"));
+        activate = true;
     }
     m_view.abort_job->setEnabled(activate);
 }
 
+void RenderWidget::slotCLeanUpJobs()
+{
+    int ix = 0;
+    QTreeWidgetItem *current = m_view.running_jobs->topLevelItem(ix);
+    while (current) {
+        if (current->data(1, Qt::UserRole + 2).toInt() == FINISHEDJOB)
+            delete current;
+        else ix++;
+        current = m_view.running_jobs->topLevelItem(ix);
+    }
+    slotCheckJob();
+}
+
 void RenderWidget::parseScriptFiles()
 {
     QStringList scriptsFilter;
@@ -1212,21 +1291,18 @@ void RenderWidget::parseScriptFiles()
             file.close();
         }
         item->setSizeHint(0, QSize(m_view.scripts_list->columnWidth(0), fontMetrics().height() * 2));
-        item->setData(0, Qt::UserRole, target);
+        item->setData(0, Qt::UserRole, target.simplified());
         item->setData(0, Qt::UserRole + 1, scriptpath.path());
     }
     bool activate = false;
-    QTreeWidgetItemIterator it(m_view.scripts_list);
-    if (*it) {
-        kDebug() << "// FOUND SCRIPT ITEM:" << (*it)->text(0);
-        // Selecting item does not work, why???
-        m_view.scripts_list->setCurrentItem(*it);
-        (*it)->setSelected(true);
+    QTreeWidgetItem *script = m_view.scripts_list->topLevelItem(0);
+    if (script) {
+        script->setSelected(true);
+        m_view.scripts_list->setCurrentItem(script);
         activate = true;
     }
-    kDebug() << "SELECTED SCRIPTS: " << m_view.scripts_list->selectedItems().count();
-    m_view.start_script->setEnabled(activate);
-    m_view.delete_script->setEnabled(activate);
+//    m_view.start_script->setEnabled(activate);
+//    m_view.delete_script->setEnabled(activate);
 }
 
 void RenderWidget::slotCheckScript()
@@ -1242,8 +1318,26 @@ void RenderWidget::slotStartScript()
 {
     QTreeWidgetItem *item = m_view.scripts_list->currentItem();
     if (item) {
+        QString destination = item->data(0, Qt::UserRole).toString();
         QString path = item->data(0, Qt::UserRole + 1).toString();
-        QProcess::startDetached(path);
+        // Insert new job in queue
+        QTreeWidgetItem *renderItem;
+        QList<QTreeWidgetItem *> existing = m_view.running_jobs->findItems(destination, Qt::MatchExactly, 1);
+        if (!existing.isEmpty()) {
+            renderItem = existing.at(0);
+            if (renderItem->data(1, Qt::UserRole + 2).toInt() == RUNNINGJOB) {
+                KMessageBox::information(this, i18n("There is already a job writing file:<br><b>%1</b><br>Abort the job if you want to overwrite it...", destination), i18n("Already running"));
+                return;
+            }
+        } else renderItem = new QTreeWidgetItem(m_view.running_jobs, QStringList() << QString() << destination << QString());
+        renderItem->setData(1, Qt::UserRole + 2, WAITINGJOB);
+        renderItem->setIcon(0, KIcon("media-playback-pause"));
+        renderItem->setData(1, Qt::UserRole, i18n("Waiting..."));
+        renderItem->setSizeHint(1, QSize(m_view.running_jobs->columnWidth(1), fontMetrics().height() * 2));
+        renderItem->setData(1, Qt::UserRole + 1, QTime::currentTime());
+        renderItem->setData(1, Qt::UserRole + 3, path);
+        renderItem->setData(1, Qt::UserRole + 4, '1');
+        checkRenderStatus();
         m_view.tabWidget->setCurrentIndex(1);
     }
 }
@@ -1264,3 +1358,7 @@ void RenderWidget::slotGenerateScript()
     slotExport(true);
 }
 
+void RenderWidget::slotHideLog()
+{
+    m_view.error_box->setVisible(false);
+}

diff --git a/src/renderwidget.h b/src/renderwidget.h
index d245976a0397dc2ccd09489044ae50c17d5ee623..7e4e8fe978022e69f1ee04f39491a0569e76a531 100644 (file)
--- a/src/renderwidget.h
+++ b/src/renderwidget.h
@@ -168,6 +168,8 @@ private slots:
     void slotCheckScript();
     void slotCheckJob();
     void slotEditItem(QListWidgetItem *item);
+    void slotCLeanUpJobs();
+    void slotHideLog();
 
 private:
     Ui::RenderWidget_UI m_view;
@@ -177,9 +179,10 @@ private:
     void parseFile(QString exportFile, bool editable);
     void updateButtons();
     KUrl filenameWithExtension(KUrl url, QString extension);
+    void checkRenderStatus();
 
 signals:
-    void doRender(const QString&, const QString&, const QStringList &, const QStringList &, bool, bool, double, double, bool, const QString &);
+    void doRender(const QStringList&, const QStringList&);
     void abortProcess(const QString &url);
     void openDvdWizard(const QString &url, const QString &profile);
 };