From d99fc865a759d1909af9031903b0b8e87be5449c Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Mardelle Date: Wed, 24 Jun 2009 18:23:12 +0000 Subject: [PATCH] Add guide positions in render dialog http://www.kdenlive.org:80/mantis/view.php?id=951 svn path=/trunk/kdenlive/; revision=3643 --- src/renderwidget.cpp | 14 ++++++-------- src/renderwidget.h | 1 - 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/renderwidget.cpp b/src/renderwidget.cpp index 9dea571b..afd745ef 100644 --- 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 #include @@ -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 bc9beaf5..ad4330cf 100644 --- 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); -- 2.39.2