Add guide positions in render dialog

http://www.kdenlive.org:80/mantis/view.php?id=951

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

diff --git a/src/renderwidget.cpp b/src/renderwidget.cpp
index 9dea571b7a6df33966273345886518b0153ce415..afd745ef13384bc884af2b78a2ed8907ea3a29f2 100644 (file)
--- a/src/renderwidget.cpp
+++ b/src/renderwidget.cpp
@@ -21,6 +21,7 @@
 #include "renderwidget.h"
 #include "kdenlivesettings.h"
 #include "ui_saveprofile_ui.h"
+#include "timecode.h"
 
 #include <KStandardDirs>
 #include <KDebug>
@@ -235,11 +236,14 @@ void RenderWidget::setGuides(QDomElement guidesxml, double duration)
         m_view.render_guide->setEnabled(false);
         m_view.create_chapter->setEnabled(false);
     }
+    double fps = (double) m_profile.frame_rate_num / m_profile.frame_rate_den;
     for (int i = 0; i < nodes.count(); i++) {
         QDomElement e = nodes.item(i).toElement();
         if (!e.isNull()) {
-            m_view.guide_start->addItem(e.attribute("comment"), e.attribute("time").toDouble());
-            m_view.guide_end->addItem(e.attribute("comment"), e.attribute("time").toDouble());
+            GenTime pos = GenTime(e.attribute("time").toDouble());
+            const QString guidePos = Timecode::getStringTimecode(pos.frames(fps), fps);
+            m_view.guide_start->addItem(e.attribute("comment") + '/' + guidePos, e.attribute("time").toDouble());
+            m_view.guide_end->addItem(e.attribute("comment") + '/' + guidePos, e.attribute("time").toDouble());
         }
     }
     if (nodes.count() > 0)
@@ -705,12 +709,6 @@ void RenderWidget::slotExport(bool scriptExport, int zoneIn, int zoneOut, const
 
     QString scriptName;
     if (scriptExport) {
-
-        /*renderParameters << scriptName;
-        if (group == "dvd") renderParameters << QString::number(m_view.create_chapter->isChecked());
-        else renderParameters << QString::number(false);
-        emit doRender(renderParameters, overlayargs);*/
-
         // Generate script file
         QFile file(scriptPath);
         if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {

diff --git a/src/renderwidget.h b/src/renderwidget.h
index bc9beaf5886ad1a77bdadcd255ef0c691fe874be..ad4330cfdd0f817390c131d973f602e4a60821a4 100644 (file)
--- a/src/renderwidget.h
+++ b/src/renderwidget.h
@@ -152,7 +152,6 @@ private:
     void checkRenderStatus();
 
 signals:
-    void doRender(const QStringList&, const QStringList&);
     void abortProcess(const QString &url);
     void openDvdWizard(const QString &url, const QString &profile);
     void selectedRenderProfile(const QString &category, const QString &name);