From: <j-...@us...> - 2009-04-05 11:06:52
|
Revision: 3218 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3218&view=rev Author: j-b-m Date: 2009-04-05 11:06:37 +0000 (Sun, 05 Apr 2009) Log Message: ----------- Fix rendering with profiles starting by "s=" Modified Paths: -------------- trunk/kdenlive/src/renderwidget.cpp Modified: trunk/kdenlive/src/renderwidget.cpp =================================================================== --- trunk/kdenlive/src/renderwidget.cpp 2009-04-05 02:11:34 UTC (rev 3217) +++ trunk/kdenlive/src/renderwidget.cpp 2009-04-05 11:06:37 UTC (rev 3218) @@ -592,7 +592,7 @@ startPos = m_view.guide_start->itemData(m_view.guide_start->currentIndex()).toDouble(); endPos = m_view.guide_end->itemData(m_view.guide_end->currentIndex()).toDouble(); } - QString renderArgs = m_view.advanced_params->toPlainText(); + QString renderArgs = m_view.advanced_params->toPlainText().simplified(); // Adjust frame scale int width; @@ -620,7 +620,12 @@ QString std = renderArgs; QString destination = m_view.destination_list->itemData(m_view.destination_list->currentIndex()).toString(); - if (std.contains(" s=")) { + if (std.startsWith("s=")) { + QString subsize = std.section(' ', 0, 0).toLower(); + subsize = subsize.section("=", 1, 1); + const QString currentSize = QString::number(width) + 'x' + QString::number(height); + if (subsize != currentSize) resizeProfile = true; + } else if (std.contains(" s=")) { QString subsize = std.section(" s=", 1, 1); subsize = subsize.section(' ', 0, 0).toLower(); const QString currentSize = QString::number(width) + 'x' + QString::number(height); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ra...@us...> - 2009-04-10 15:06:30
|
Revision: 3281 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3281&view=rev Author: rayll Date: 2009-04-10 15:06:09 +0000 (Fri, 10 Apr 2009) Log Message: ----------- [PATCH 6/6] Fix a memory leak Signed-off-by: Ray Lehtiniemi <ra...@ma...> Modified Paths: -------------- trunk/kdenlive/src/renderwidget.cpp Modified: trunk/kdenlive/src/renderwidget.cpp =================================================================== --- trunk/kdenlive/src/renderwidget.cpp 2009-04-10 15:05:55 UTC (rev 3280) +++ trunk/kdenlive/src/renderwidget.cpp 2009-04-10 15:06:09 UTC (rev 3281) @@ -334,6 +334,7 @@ if (file.error() != QFile::NoError) { KMessageBox::error(this, i18n("Cannot write to file %1", exportFile)); file.close(); + delete d; return; } file.close(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-05-16 18:09:20
|
Revision: 3388 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3388&view=rev Author: j-b-m Date: 2009-05-16 18:09:10 +0000 (Sat, 16 May 2009) Log Message: ----------- Disable creation of chapters file when no guide is present Modified Paths: -------------- trunk/kdenlive/src/renderwidget.cpp Modified: trunk/kdenlive/src/renderwidget.cpp =================================================================== --- trunk/kdenlive/src/renderwidget.cpp 2009-05-16 18:07:09 UTC (rev 3387) +++ trunk/kdenlive/src/renderwidget.cpp 2009-05-16 18:09:10 UTC (rev 3388) @@ -225,7 +225,11 @@ if (nodes.count() > 0) { m_view.guide_start->addItem(i18n("Render"), "0"); m_view.render_guide->setEnabled(true); - } else m_view.render_guide->setEnabled(false); + m_view.create_chapter->setEnabled(true); + } else { + m_view.render_guide->setEnabled(false); + m_view.create_chapter->setEnabled(false); + } for (int i = 0; i < nodes.count(); i++) { QDomElement e = nodes.item(i).toElement(); if (!e.isNull()) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dde...@us...> - 2009-05-30 06:43:54
|
Revision: 3456 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3456&view=rev Author: ddennedy Date: 2009-05-30 06:43:01 +0000 (Sat, 30 May 2009) Log Message: ----------- Fix rendering bugs (874) when using the Rescale option due to not inserting the consumer producer. Modified Paths: -------------- trunk/kdenlive/src/renderwidget.cpp Modified: trunk/kdenlive/src/renderwidget.cpp =================================================================== --- trunk/kdenlive/src/renderwidget.cpp 2009-05-30 04:48:41 UTC (rev 3455) +++ trunk/kdenlive/src/renderwidget.cpp 2009-05-30 06:43:01 UTC (rev 3456) @@ -614,24 +614,24 @@ // Check if the rendering profile is different from project profile, // in which case we need to use the producer_comsumer from MLT - bool resizeProfile = false; - QString std = renderArgs; QString destination = m_view.destination_list->itemData(m_view.destination_list->currentIndex()).toString(); + const QString currentSize = QString::number(width) + 'x' + QString::number(height); + QString subsize = currentSize; if (std.startsWith("s=")) { - QString subsize = std.section(' ', 0, 0).toLower(); + subsize = std.section(' ', 0, 0).toLower(); subsize = subsize.section("=", 1, 1); - const QString currentSize = QString::number(width) + 'x' + QString::number(height); - if (subsize != currentSize) resizeProfile = true; } else if (std.contains(" s=")) { - QString subsize = std.section(" s=", 1, 1); + subsize = std.section(" s=", 1, 1); subsize = subsize.section(' ', 0, 0).toLower(); - const QString currentSize = QString::number(width) + 'x' + QString::number(height); - if (subsize != currentSize) resizeProfile = true; - } else if (destination != "audioonly") { - // Add current size parametrer - renderArgs.append(QString(" s=%1x%2").arg(width).arg(height)); + } else if (destination != "audioonly" && m_view.rescale->isChecked() && m_view.rescale->isEnabled()) + { + subsize = QString(" s=%1x%2").arg(width).arg(height); + // Add current size parameter + renderArgs.append(subsize); } + bool resizeProfile = (subsize != currentSize); + QString group = m_view.size_list->currentItem()->data(MetaGroupRole).toString(); QStringList renderParameters; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gr...@us...> - 2009-06-02 14:12:54
|
Revision: 3478 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3478&view=rev Author: granjow Date: 2009-06-02 14:12:52 +0000 (Tue, 02 Jun 2009) Log Message: ----------- type of comments changed Modified Paths: -------------- trunk/kdenlive/src/renderwidget.cpp Modified: trunk/kdenlive/src/renderwidget.cpp =================================================================== --- trunk/kdenlive/src/renderwidget.cpp 2009-06-02 08:43:58 UTC (rev 3477) +++ trunk/kdenlive/src/renderwidget.cpp 2009-06-02 14:12:52 UTC (rev 3478) @@ -241,8 +241,10 @@ m_view.guide_end->addItem(i18n("End"), QString::number(duration)); } -// Will be called when the user selects an output file via the file dialog. -// File extension will be added automatically. +/** + * Will be called when the user selects an output file via the file dialog. + * File extension will be added automatically. + */ void RenderWidget::slotUpdateButtons(KUrl url) { if (m_view.out_file->url().isEmpty()) m_view.buttonStart->setEnabled(false); @@ -255,8 +257,10 @@ } } -// Will be called when the user changes the output file path in the text line. -// File extension must NOT be added, would make editing impossible! +/** + * Will be called when the user changes the output file path in the text line. + * File extension must NOT be added, would make editing impossible! + */ void RenderWidget::slotUpdateButtons() { if (m_view.out_file->url().isEmpty()) m_view.buttonStart->setEnabled(false); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-06-15 19:55:10
|
Revision: 3542 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3542&view=rev Author: j-b-m Date: 2009-06-15 19:54:49 +0000 (Mon, 15 Jun 2009) Log Message: ----------- Wrong rendering profiles should still be editable: http://kdenlive.org/mantis/view.php?id=820 Modified Paths: -------------- trunk/kdenlive/src/renderwidget.cpp Modified: trunk/kdenlive/src/renderwidget.cpp =================================================================== --- trunk/kdenlive/src/renderwidget.cpp 2009-06-15 18:54:45 UTC (rev 3541) +++ trunk/kdenlive/src/renderwidget.cpp 2009-06-15 19:54:49 UTC (rev 3542) @@ -241,7 +241,7 @@ m_view.guide_end->addItem(i18n("End"), QString::number(duration)); } -/** +/** * Will be called when the user selects an output file via the file dialog. * File extension will be added automatically. */ @@ -249,9 +249,9 @@ { if (m_view.out_file->url().isEmpty()) m_view.buttonStart->setEnabled(false); else { - updateButtons(); // This also checks whether the selected format is available - //m_view.buttonStart->setEnabled(true); - } + updateButtons(); // This also checks whether the selected format is available + //m_view.buttonStart->setEnabled(true); + } if (url != 0) { QListWidgetItem *item = m_view.size_list->currentItem(); QString extension = item->data(ExtensionRole).toString(); @@ -268,7 +268,7 @@ { if (m_view.out_file->url().isEmpty()) m_view.buttonStart->setEnabled(false); else updateButtons(); // This also checks whether the selected format is available - //else m_view.buttonStart->setEnabled(true); + //else m_view.buttonStart->setEnabled(true); } void RenderWidget::slotSaveProfile() @@ -541,7 +541,7 @@ m_view.buttonStart->setEnabled(false); } else { m_view.buttonSave->setEnabled(true); - m_view.buttonStart->setEnabled(m_view.size_list->currentItem()->flags() & Qt::ItemIsEnabled); + m_view.buttonStart->setEnabled(m_view.size_list->currentItem()->toolTip().isEmpty()); QString edit = m_view.size_list->currentItem()->data(EditableRole).toString(); if (edit.isEmpty() || !edit.endsWith("customprofiles.xml")) { m_view.buttonDelete->setEnabled(false); @@ -578,16 +578,16 @@ QString dest = m_view.out_file->url().path(); if (dest.isEmpty()) return; - - // Check whether target file has an extension. - // If not, ask whether extension should be added or not. - QString extension = item->data(ExtensionRole).toString(); - if (!dest.endsWith(extension)) { - if (KMessageBox::questionYesNo(this, i18n("File has no extension. Add extension (%1)?", extension)) == KMessageBox::Yes) { - dest.append("." + extension); - } - } - + + // Check whether target file has an extension. + // If not, ask whether extension should be added or not. + QString extension = item->data(ExtensionRole).toString(); + if (!dest.endsWith(extension)) { + if (KMessageBox::questionYesNo(this, i18n("File has no extension. Add extension (%1)?", extension)) == KMessageBox::Yes) { + dest.append("." + extension); + } + } + QFile f(dest); if (f.exists()) { if (KMessageBox::warningYesNo(this, i18n("Output file already exists. Do you want to overwrite it?")) != KMessageBox::Yes) @@ -642,8 +642,7 @@ } else if (std.contains(" s=")) { subsize = std.section(" s=", 1, 1); subsize = subsize.section(' ', 0, 0).toLower(); - } else if (destination != "audioonly" && m_view.rescale->isChecked() && m_view.rescale->isEnabled()) - { + } else if (destination != "audioonly" && m_view.rescale->isChecked() && m_view.rescale->isEnabled()) { subsize = QString(" s=%1x%2").arg(width).arg(height); // Add current size parameter renderArgs.append(subsize); @@ -854,7 +853,7 @@ if (!formatsList.contains(format)) { kDebug() << "***** UNSUPPORTED F: " << format; //sizeItem->setHidden(true); - sizeItem->setFlags(Qt::ItemIsSelectable); + //sizeItem->setFlags(Qt::ItemIsSelectable); sizeItem->setToolTip(i18n("Unsupported video format: %1", format)); sizeItem->setIcon(brokenIcon); } @@ -869,7 +868,7 @@ if (!acodecsList.contains(format)) { kDebug() << "***** UNSUPPORTED ACODEC: " << format; //sizeItem->setHidden(true); - sizeItem->setFlags(Qt::ItemIsSelectable); + //sizeItem->setFlags(Qt::ItemIsSelectable); sizeItem->setToolTip(i18n("Unsupported audio codec: %1", format)); sizeItem->setIcon(brokenIcon); } @@ -884,7 +883,7 @@ if (!vcodecsList.contains(format)) { kDebug() << "***** UNSUPPORTED VCODEC: " << format; //sizeItem->setHidden(true); - sizeItem->setFlags(Qt::ItemIsSelectable); + //sizeItem->setFlags(Qt::ItemIsSelectable); sizeItem->setToolTip(i18n("Unsupported video codec: %1", format)); sizeItem->setIcon(brokenIcon); } @@ -919,7 +918,7 @@ */ void RenderWidget::refreshParams() { - // Format not available (e.g. codec not installed); Disable start button + // Format not available (e.g. codec not installed); Disable start button QListWidgetItem *item = m_view.size_list->currentItem(); if (!item || item->isHidden()) { m_view.advanced_params->clear(); @@ -959,7 +958,7 @@ m_view.buttonEdit->setEnabled(true); } - m_view.buttonStart->setEnabled(m_view.size_list->currentItem()->flags() & Qt::ItemIsEnabled); + m_view.buttonStart->setEnabled(m_view.size_list->currentItem()->toolTip().isEmpty()); } void RenderWidget::reloadProfiles() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <xz...@us...> - 2009-06-18 07:55:28
|
Revision: 3568 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3568&view=rev Author: xzhayon Date: 2009-06-18 07:55:26 +0000 (Thu, 18 Jun 2009) Log Message: ----------- fix the expression "From Render to..." replacing "Render" with "Beginning": http://www.kdenlive.org/mantis/view.php?id=928 Modified Paths: -------------- trunk/kdenlive/src/renderwidget.cpp Modified: trunk/kdenlive/src/renderwidget.cpp =================================================================== --- trunk/kdenlive/src/renderwidget.cpp 2009-06-18 06:41:26 UTC (rev 3567) +++ trunk/kdenlive/src/renderwidget.cpp 2009-06-18 07:55:26 UTC (rev 3568) @@ -223,7 +223,7 @@ m_view.guide_end->clear(); QDomNodeList nodes = guidesxml.elementsByTagName("guide"); if (nodes.count() > 0) { - m_view.guide_start->addItem(i18n("Render"), "0"); + m_view.guide_start->addItem(i18n("Beginning"), "0"); m_view.render_guide->setEnabled(true); m_view.create_chapter->setEnabled(true); } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-06-19 18:19:38
|
Revision: 3596 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3596&view=rev Author: j-b-m Date: 2009-06-19 18:19:35 +0000 (Fri, 19 Jun 2009) Log Message: ----------- Unsupported rendering profiles now have a red background, making it easier to see them: http://www.kdenlive.org:80/mantis/view.php?id=820 Modified Paths: -------------- trunk/kdenlive/src/renderwidget.cpp Modified: trunk/kdenlive/src/renderwidget.cpp =================================================================== --- trunk/kdenlive/src/renderwidget.cpp 2009-06-19 15:08:05 UTC (rev 3595) +++ trunk/kdenlive/src/renderwidget.cpp 2009-06-19 18:19:35 UTC (rev 3596) @@ -28,6 +28,7 @@ #include <KComboBox> #include <KRun> #include <KIO/NetAccess> +#include <KColorScheme> // #include <knewstuff2/engine.h> #include <QDomDocument> @@ -291,6 +292,7 @@ ui.parameters->setText(m_view.advanced_params->toPlainText()); ui.extension->setText(m_view.size_list->currentItem()->data(ExtensionRole).toString()); ui.profile_name->setFocus(); + if (d->exec() == QDialog::Accepted && !ui.profile_name->text().simplified().isEmpty()) { QString exportFile = KStandardDirs::locateLocal("appdata", "export/customprofiles.xml"); QDomDocument doc; @@ -827,6 +829,10 @@ const QStringList vcodecsList = KdenliveSettings::videocodecs(); const QStringList acodecsList = KdenliveSettings::audiocodecs(); + KColorScheme scheme(palette().currentColorGroup(), KColorScheme::Window); + const QColor disabled = scheme.foreground(KColorScheme::InactiveText).color(); + const QColor disabledbg = scheme.background(KColorScheme::NegativeBackground).color(); + for (int i = 0; i < m_view.size_list->count(); i++) { sizeItem = m_view.size_list->item(i); if ((sizeItem->data(GroupRole) == group || sizeItem->data(GroupRole).toString().isEmpty()) && sizeItem->data(MetaGroupRole) == destination) { @@ -856,6 +862,7 @@ //sizeItem->setFlags(Qt::ItemIsSelectable); sizeItem->setToolTip(i18n("Unsupported video format: %1", format)); sizeItem->setIcon(brokenIcon); + sizeItem->setForeground(disabled); } } } @@ -871,6 +878,8 @@ //sizeItem->setFlags(Qt::ItemIsSelectable); sizeItem->setToolTip(i18n("Unsupported audio codec: %1", format)); sizeItem->setIcon(brokenIcon); + sizeItem->setForeground(disabled); + sizeItem->setBackground(disabledbg); } } } @@ -886,6 +895,7 @@ //sizeItem->setFlags(Qt::ItemIsSelectable); sizeItem->setToolTip(i18n("Unsupported video codec: %1", format)); sizeItem->setIcon(brokenIcon); + sizeItem->setForeground(disabled); } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-06-23 17:02:36
|
Revision: 3626 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3626&view=rev Author: j-b-m Date: 2009-06-23 17:02:34 +0000 (Tue, 23 Jun 2009) Log Message: ----------- Fix breakage of render parameters: http://kdenlive.org/mantis/view.php?id=948 Modified Paths: -------------- trunk/kdenlive/src/renderwidget.cpp Modified: trunk/kdenlive/src/renderwidget.cpp =================================================================== --- trunk/kdenlive/src/renderwidget.cpp 2009-06-23 16:05:35 UTC (rev 3625) +++ trunk/kdenlive/src/renderwidget.cpp 2009-06-23 17:02:34 UTC (rev 3626) @@ -682,7 +682,7 @@ renderArgs.append(subsize); } bool resizeProfile = (subsize != currentSize); - QStringList paramsList = renderArgs.split(" "); + QStringList paramsList = renderArgs.split(" ", QString::SkipEmptyParts); for (int i = 0; i < paramsList.count(); i++) { if (paramsList.at(i).startsWith("profile=")) { if (paramsList.at(i).section('=', 1) != m_profile.path) resizeProfile = true; @@ -693,7 +693,7 @@ if (resizeProfile) render_process_args << "consumer:" + playlistPath; else render_process_args << playlistPath; render_process_args << dest; - render_process_args << renderArgs; + render_process_args << paramsList; QString group = m_view.size_list->currentItem()->data(MetaGroupRole).toString(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-06-23 20:01:27
|
Revision: 3630 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3630&view=rev Author: j-b-m Date: 2009-06-23 20:01:19 +0000 (Tue, 23 Jun 2009) Log Message: ----------- Some more checks for render scripts Modified Paths: -------------- trunk/kdenlive/src/renderwidget.cpp Modified: trunk/kdenlive/src/renderwidget.cpp =================================================================== --- trunk/kdenlive/src/renderwidget.cpp 2009-06-23 19:26:18 UTC (rev 3629) +++ trunk/kdenlive/src/renderwidget.cpp 2009-06-23 20:01:19 UTC (rev 3630) @@ -804,11 +804,16 @@ // Normal render process QString renderer = QCoreApplication::applicationDirPath() + QString("/kdenlive_render"); if (!QFile::exists(renderer)) renderer = "kdenlive_render"; - QProcess::startDetached(renderer, item->data(1, Qt::UserRole + 3).toStringList()); - KNotification::event("RenderStarted", i18n("Rendering <i>%1</i> started", item->text(1)), QPixmap(), this); + if (QProcess::startDetached(renderer, item->data(1, Qt::UserRole + 3).toStringList()) == false) { + item->setData(1, Qt::UserRole + 2, FINISHEDJOB); + item->setData(1, Qt::UserRole, i18n("Rendering crashed")); + item->setIcon(0, KIcon("dialog-close")); + item->setData(2, Qt::UserRole, 100); + } else KNotification::event("RenderStarted", i18n("Rendering <i>%1</i> started", item->text(1)), QPixmap(), this); } else { // Script item if (QProcess::startDetached(item->data(1, Qt::UserRole + 3).toString()) == false) { + item->setData(1, Qt::UserRole + 2, FINISHEDJOB); item->setData(1, Qt::UserRole, i18n("Rendering crashed")); item->setIcon(0, KIcon("dialog-close")); item->setData(2, Qt::UserRole, 100); @@ -1078,8 +1083,8 @@ // can also override profiles installed by KNewStuff fileList.removeAll("customprofiles.xml"); foreach(const QString &filename, fileList) - parseFile(exportFolder + '/' + filename, true); - if (QFile::exists(exportFolder + "/customprofiles.xml")) parseFile(exportFolder + "/customprofiles.xml", true); + parseFile(exportFolder + filename, true); + if (QFile::exists(exportFolder + "customprofiles.xml")) parseFile(exportFolder + "customprofiles.xml", true); if (!meta.isEmpty()) { m_view.destination_list->blockSignals(true); @@ -1368,6 +1373,7 @@ else { delete current; slotCheckJob(); + checkRenderStatus(); } } } @@ -1409,7 +1415,6 @@ QStringList scriptFiles = QDir(m_projectFolder + "scripts").entryList(scriptsFilter, QDir::Files); for (int i = 0; i < scriptFiles.size(); ++i) { KUrl scriptpath(m_projectFolder + "scripts/" + scriptFiles.at(i)); - item = new QTreeWidgetItem(m_view.scripts_list, QStringList() << QString() << scriptpath.fileName()); QString target; QString renderer; QString melt; @@ -1430,12 +1435,16 @@ } file.close(); } + if (target.isEmpty()) continue; + item = new QTreeWidgetItem(m_view.scripts_list, QStringList() << QString() << scriptpath.fileName()); if (!renderer.isEmpty() && renderer.contains('/') && !QFile::exists(renderer)) { item->setIcon(0, KIcon("dialog-cancel")); item->setToolTip(1, i18n("Script contains wrong command: %1", renderer)); + item->setData(0, Qt::UserRole, '1'); } else if (!melt.isEmpty() && melt.contains('/') && !QFile::exists(melt)) { item->setIcon(0, KIcon("dialog-cancel")); item->setToolTip(1, i18n("Script contains wrong command: %1", melt)); + item->setData(0, Qt::UserRole, '1'); } else item->setIcon(0, KIcon("application-x-executable-script")); item->setSizeHint(0, QSize(m_view.scripts_list->columnWidth(0), fontMetrics().height() * 2)); item->setData(1, Qt::UserRole, target.simplified()); @@ -1454,11 +1463,9 @@ void RenderWidget::slotCheckScript() { - bool activate = false; - QTreeWidgetItemIterator it(m_view.scripts_list); - if (*it) activate = true; - m_view.start_script->setEnabled(activate); - m_view.delete_script->setEnabled(activate); + QTreeWidgetItem *item = m_view.scripts_list->currentItem(); + m_view.start_script->setEnabled(item->data(0, Qt::UserRole).toString().isEmpty()); + m_view.delete_script->setEnabled(true); } void RenderWidget::slotStartScript() @@ -1561,9 +1568,14 @@ QTreeWidgetItem *item = m_view.running_jobs->topLevelItem(0); while (item) { if (item->data(1, Qt::UserRole + 2).toInt() == WAITINGJOB) { - // Add render process for item - const QString params = item->data(1, Qt::UserRole + 3).toStringList().join(" "); - outStream << renderer << " " << params << "\n"; + if (item->data(1, Qt::UserRole + 4).isNull()) { + // Add render process for item + const QString params = item->data(1, Qt::UserRole + 3).toStringList().join(" "); + outStream << renderer << " " << params << "\n"; + } else { + // Script item + outStream << item->data(1, Qt::UserRole + 3).toString() << "\n"; + } } item = m_view.running_jobs->itemBelow(item); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-06-23 20:10:07
|
Revision: 3631 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3631&view=rev Author: j-b-m Date: 2009-06-23 20:10:06 +0000 (Tue, 23 Jun 2009) Log Message: ----------- prevent script related crash Modified Paths: -------------- trunk/kdenlive/src/renderwidget.cpp Modified: trunk/kdenlive/src/renderwidget.cpp =================================================================== --- trunk/kdenlive/src/renderwidget.cpp 2009-06-23 20:01:19 UTC (rev 3630) +++ trunk/kdenlive/src/renderwidget.cpp 2009-06-23 20:10:06 UTC (rev 3631) @@ -1464,6 +1464,7 @@ void RenderWidget::slotCheckScript() { QTreeWidgetItem *item = m_view.scripts_list->currentItem(); + if (item == NULL) return; m_view.start_script->setEnabled(item->data(0, Qt::UserRole).toString().isEmpty()); m_view.delete_script->setEnabled(true); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-06-29 09:22:43
|
Revision: 3689 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3689&view=rev Author: j-b-m Date: 2009-06-29 09:22:41 +0000 (Mon, 29 Jun 2009) Log Message: ----------- Don't use translatable string for comparison in render widget: http://www.kdenlive.org/mantis/view.php?id=969 Modified Paths: -------------- trunk/kdenlive/src/renderwidget.cpp Modified: trunk/kdenlive/src/renderwidget.cpp =================================================================== --- trunk/kdenlive/src/renderwidget.cpp 2009-06-29 09:16:00 UTC (rev 3688) +++ trunk/kdenlive/src/renderwidget.cpp 2009-06-29 09:22:41 UTC (rev 3689) @@ -1237,7 +1237,8 @@ if (!gname.isNull()) { metagroupName = gname.firstChild().nodeValue(); metagroupId = gname.toElement().attribute("id"); - if (!metagroupName.isEmpty() && !m_view.destination_list->contains(metagroupName)) { + + if (!metagroupName.isEmpty() && m_view.destination_list->findData(metagroupId) == -1) { if (metagroupId == "dvd") icon = KIcon("media-optical"); else if (metagroupId == "audioonly") icon = KIcon("audio-x-generic"); else if (metagroupId == "websites") icon = KIcon("applications-internet"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-06-29 23:12:33
|
Revision: 3696 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3696&view=rev Author: j-b-m Date: 2009-06-29 23:11:56 +0000 (Mon, 29 Jun 2009) Log Message: ----------- Replace acodec=vorbis with acodec=libvorbis if required for rendering: http://kdenlive.org/mantis/view.php?id=975 Modified Paths: -------------- trunk/kdenlive/src/renderwidget.cpp Modified: trunk/kdenlive/src/renderwidget.cpp =================================================================== --- trunk/kdenlive/src/renderwidget.cpp 2009-06-29 17:34:33 UTC (rev 3695) +++ trunk/kdenlive/src/renderwidget.cpp 2009-06-29 23:11:56 UTC (rev 3696) @@ -931,7 +931,6 @@ if (!sizeItem->isHidden()) { // Make sure the selected profile uses an installed avformat codec / format std = sizeItem->data(ParamsRole).toString(); - if (!formatsList.isEmpty()) { QString format; if (std.startsWith("f=")) format = std.section("f=", 1, 1); @@ -1122,6 +1121,11 @@ QListWidgetItem *item; QDomNodeList groups = doc.elementsByTagName("group"); + const QStringList acodecsList = KdenliveSettings::audiocodecs(); + bool replaceVorbisCodec = false; + if (!acodecsList.contains("vorbis") && acodecsList.contains("libvorbis")) replaceVorbisCodec = true; + + if (editable || groups.count() == 0) { QDomElement profiles = doc.documentElement(); if (editable && profiles.attribute("version", 0).toInt() < 1) { @@ -1168,6 +1172,13 @@ QString profileName = profile.attribute("name"); QString standard = profile.attribute("standard"); QString params = profile.attribute("args"); + + if (replaceVorbisCodec && params.contains("acodec=vorbis")) { + // replace vorbis with libvorbis + params = params.replace("vorbis", "libvorbis"); + } + + QString category = profile.attribute("category", i18n("Custom")); QString dest = profile.attribute("destinationid"); QString prof_extension = profile.attribute("extension"); @@ -1274,6 +1285,11 @@ profileName = profileElement.attribute("name"); standard = profileElement.attribute("standard"); params = profileElement.attribute("args"); + + if (replaceVorbisCodec && params.contains("acodec=vorbis")) { + // replace vorbis with libvorbis + params = params.replace("vorbis", "libvorbis"); + } prof_extension = profileElement.attribute("extension"); if (!prof_extension.isEmpty()) extension = prof_extension; item = new QListWidgetItem(profileName, m_view.size_list); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gr...@us...> - 2009-07-23 10:13:11
|
Revision: 3757 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3757&view=rev Author: granjow Date: 2009-07-23 10:13:09 +0000 (Thu, 23 Jul 2009) Log Message: ----------- Renderer dialog: * Default name for videos is now translatable (instead of being untitled everywhere) * If manually directory entered like /tmp/a/, path is extended with default filename instead of like /tmp/a/.avi * Extension won't be changed to lowercase (e.g. if file with uppercase extension already exists) after selecting it and then selecting a different format (but with same file extension) * Fixed renderer crashing when target directory doesn't exist <http://www.kdenlive.org/mantis/view.php?id=1051> Modified Paths: -------------- trunk/kdenlive/src/renderwidget.cpp Modified: trunk/kdenlive/src/renderwidget.cpp =================================================================== --- trunk/kdenlive/src/renderwidget.cpp 2009-07-22 15:08:08 UTC (rev 3756) +++ trunk/kdenlive/src/renderwidget.cpp 2009-07-23 10:13:09 UTC (rev 3757) @@ -594,6 +594,10 @@ KMessageBox::sorry(this, i18n("Cannot play video after rendering because the default video player application is not set.\nPlease define it in Kdenlive settings dialog.")); QString chapterFile; if (m_view.create_chapter->isChecked()) chapterFile = m_view.out_file->url().path() + ".dvdchapter"; + + // mantisbt 1051 + KStandardDirs::makeDir(m_view.out_file->url().path(KUrl::AddTrailingSlash)); + emit prepareRenderingData(scriptExport, m_view.render_zone->isChecked(), chapterFile); } @@ -990,17 +994,24 @@ KUrl RenderWidget::filenameWithExtension(KUrl url, QString extension) { - QString path; - if (!url.isEmpty()) { - path = url.path(); - int pos = path.lastIndexOf('.') + 1; - if (pos == 0) path.append('.' + extension); - else path = path.left(pos) + extension; + QString directory = url.directory(KUrl::AppendTrailingSlash | KUrl::ObeyTrailingSlash); + QString filename = url.fileName(KUrl::ObeyTrailingSlash); + QString ext; - } else { - path = m_projectFolder + "untitled." + extension; + if (extension.at(0) == '.') ext = extension; + else ext = '.' + extension; + + if (filename.isEmpty()) filename = i18n("untitled"); + + int pos = filename.lastIndexOf('.'); + if (pos == 0) filename.append(ext); + else { + if (!filename.endsWith(ext, Qt::CaseInsensitive)) { + filename = filename.left(pos) + ext; + } } - return KUrl(path); + + return KUrl(directory + filename); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gr...@us...> - 2009-07-24 19:48:08
|
Revision: 3763 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3763&view=rev Author: granjow Date: 2009-07-24 19:47:50 +0000 (Fri, 24 Jul 2009) Log Message: ----------- Fixed: Rendering possible again Modified Paths: -------------- trunk/kdenlive/src/renderwidget.cpp Modified: trunk/kdenlive/src/renderwidget.cpp =================================================================== --- trunk/kdenlive/src/renderwidget.cpp 2009-07-23 23:40:45 UTC (rev 3762) +++ trunk/kdenlive/src/renderwidget.cpp 2009-07-24 19:47:50 UTC (rev 3763) @@ -596,7 +596,7 @@ if (m_view.create_chapter->isChecked()) chapterFile = m_view.out_file->url().path() + ".dvdchapter"; // mantisbt 1051 - KStandardDirs::makeDir(m_view.out_file->url().path(KUrl::AddTrailingSlash)); + KStandardDirs::makeDir(m_view.out_file->url().directory()); emit prepareRenderingData(scriptExport, m_view.render_zone->isChecked(), chapterFile); } @@ -613,7 +613,7 @@ // Check whether target file has an extension. // If not, ask whether extension should be added or not. QString extension = item->data(ExtensionRole).toString(); - if (!dest.endsWith(extension)) { + if (!dest.endsWith(extension, Qt::CaseInsensitive)) { if (KMessageBox::questionYesNo(this, i18n("File has no extension. Add extension (%1)?", extension)) == KMessageBox::Yes) { dest.append("." + extension); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-07-25 12:57:01
|
Revision: 3769 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3769&view=rev Author: j-b-m Date: 2009-07-25 12:56:53 +0000 (Sat, 25 Jul 2009) Log Message: ----------- Fix rendering with timecode overlay that was completely broken and generated endless render jobs Modified Paths: -------------- trunk/kdenlive/src/renderwidget.cpp Modified: trunk/kdenlive/src/renderwidget.cpp =================================================================== --- trunk/kdenlive/src/renderwidget.cpp 2009-07-25 12:10:51 UTC (rev 3768) +++ trunk/kdenlive/src/renderwidget.cpp 2009-07-25 12:56:53 UTC (rev 3769) @@ -649,7 +649,8 @@ render_process_args << "in=" + QString::number(GenTime(guideStart).frames(fps)) << "out=" + QString::number(GenTime(guideEnd).frames(fps)); } - render_process_args << overlayargs; + if (!overlayargs.isEmpty()) render_process_args << "preargs=" + overlayargs.join(" "); + render_process_args << KdenliveSettings::rendererpath() << m_profile.path << item->data(RenderRole).toString(); if (m_view.play_after->isChecked()) render_process_args << KdenliveSettings::KdenliveSettings::defaultplayerapp(); else render_process_args << "-"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-08-10 20:10:27
|
Revision: 3814 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3814&view=rev Author: j-b-m Date: 2009-08-10 20:10:16 +0000 (Mon, 10 Aug 2009) Log Message: ----------- Fix default directory for rendering Modified Paths: -------------- trunk/kdenlive/src/renderwidget.cpp Modified: trunk/kdenlive/src/renderwidget.cpp =================================================================== --- trunk/kdenlive/src/renderwidget.cpp 2009-08-10 20:05:13 UTC (rev 3813) +++ trunk/kdenlive/src/renderwidget.cpp 2009-08-10 20:10:16 UTC (rev 3814) @@ -999,6 +999,7 @@ KUrl RenderWidget::filenameWithExtension(KUrl url, QString extension) { + if (url.isEmpty()) url = KUrl(m_projectFolder); QString directory = url.directory(KUrl::AppendTrailingSlash | KUrl::ObeyTrailingSlash); QString filename = url.fileName(KUrl::ObeyTrailingSlash); QString ext; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-08-31 13:22:38
|
Revision: 3864 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3864&view=rev Author: j-b-m Date: 2009-08-31 12:13:46 +0000 (Mon, 31 Aug 2009) Log Message: ----------- Show startup notification when opening a clip in player application Modified Paths: -------------- trunk/kdenlive/src/renderwidget.cpp Modified: trunk/kdenlive/src/renderwidget.cpp =================================================================== --- trunk/kdenlive/src/renderwidget.cpp 2009-08-30 09:17:47 UTC (rev 3863) +++ trunk/kdenlive/src/renderwidget.cpp 2009-08-31 12:13:46 UTC (rev 3864) @@ -31,6 +31,7 @@ #include <KIO/NetAccess> #include <KColorScheme> #include <KNotification> +#include <KStartupInfo> // #include <knewstuff2/engine.h> #include <QDomDocument> @@ -39,8 +40,8 @@ #include <QListWidgetItem> #include <QHeaderView> #include <QMenu> +#include <QInputDialog> #include <QProcess> -#include <QInputDialog> const int GroupRole = Qt::UserRole; const int ExtensionRole = GroupRole + 1; @@ -1658,7 +1659,9 @@ void RenderWidget::slotPlayRendering(QTreeWidgetItem *item, int) { if (KdenliveSettings::defaultplayerapp().isEmpty() || item->data(1, Qt::UserRole + 2).toInt() != FINISHEDJOB) return; - QProcess::startDetached(KdenliveSettings::defaultplayerapp(), QStringList() << item->text(1)); + const QByteArray startId = KStartupInfo::createNewStartupId (); + const QString command = KdenliveSettings::defaultplayerapp() + ' ' + item->text(1); + KRun::runCommand(command, KdenliveSettings::defaultplayerapp(), KdenliveSettings::defaultplayerapp(), this, startId); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dde...@us...> - 2009-09-16 03:38:43
|
Revision: 3895 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3895&view=rev Author: ddennedy Date: 2009-09-16 03:38:36 +0000 (Wed, 16 Sep 2009) Log Message: ----------- New versions of FFmpeg are likely not to have libfaac since it requires --enable-nonfree, and a native AAC encoder is available since July 8, 2009. Modified Paths: -------------- trunk/kdenlive/src/renderwidget.cpp Modified: trunk/kdenlive/src/renderwidget.cpp =================================================================== --- trunk/kdenlive/src/renderwidget.cpp 2009-09-15 22:40:49 UTC (rev 3894) +++ trunk/kdenlive/src/renderwidget.cpp 2009-09-16 03:38:36 UTC (rev 3895) @@ -794,7 +794,7 @@ if (m_view.open_dvd->isChecked()) { renderItem->setData(0, Qt::UserRole, group); if (renderArgs.contains("profile=")) { - // rendering profile contains an MLT profile, so pass it to the running jog item, useful for dvd + // rendering profile contains an MLT profile, so pass it to the running jog item, useful for dvd QString prof = renderArgs.section("profile=", 1, 1); prof = prof.section(' ', 0, 0); kDebug() << "// render profile: " << prof; @@ -804,7 +804,7 @@ } else { if (group == "websites" && m_view.open_browser->isChecked()) { renderItem->setData(0, Qt::UserRole, group); - // pass the url + // pass the url QString url = m_view.size_list->currentItem()->data(ExtraRole).toString(); renderItem->setData(0, Qt::UserRole + 1, url); } @@ -1154,6 +1154,8 @@ const QStringList acodecsList = KdenliveSettings::audiocodecs(); bool replaceVorbisCodec = false; if (!acodecsList.contains("vorbis") && acodecsList.contains("libvorbis")) replaceVorbisCodec = true; + bool replaceLibfaacCodec = false; + if (!acodecsList.contains("libfaac") && acodecsList.contains("aac")) replaceLibfaacCodec = true; if (editable || groups.count() == 0) { @@ -1207,8 +1209,11 @@ // replace vorbis with libvorbis params = params.replace("vorbis", "libvorbis"); } + if (replaceLibfaacCodec && params.contains("acodec=libfaac")) { + // replace libfaac with aac + params = params.replace("libfaac", "aac"); + } - QString category = profile.attribute("category", i18n("Custom")); QString dest = profile.attribute("destinationid"); QString prof_extension = profile.attribute("extension"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dde...@us...> - 2009-09-16 03:40:59
|
Revision: 3896 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3896&view=rev Author: ddennedy Date: 2009-09-16 03:40:51 +0000 (Wed, 16 Sep 2009) Log Message: ----------- New versions of FFmpeg are likely not to have libfaac since it requires --enable-nonfree, and a native AAC encoder is available since July 8, 2009. Continued. Modified Paths: -------------- trunk/kdenlive/src/renderwidget.cpp Modified: trunk/kdenlive/src/renderwidget.cpp =================================================================== --- trunk/kdenlive/src/renderwidget.cpp 2009-09-16 03:38:36 UTC (rev 3895) +++ trunk/kdenlive/src/renderwidget.cpp 2009-09-16 03:40:51 UTC (rev 3896) @@ -1325,7 +1325,12 @@ // replace vorbis with libvorbis params = params.replace("vorbis", "libvorbis"); } - prof_extension = profileElement.attribute("extension"); + if (replaceLibfaacCodec && params.contains("acodec=libfaac")) { + // replace libfaac with aac + params = params.replace("libfaac", "aac"); + } + + prof_extension = profileElement.attribute("extension"); if (!prof_extension.isEmpty()) extension = prof_extension; item = new QListWidgetItem(profileName, m_view.size_list); item->setData(GroupRole, groupName); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-11-01 10:05:26
|
Revision: 4081 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=4081&view=rev Author: j-b-m Date: 2009-11-01 10:04:49 +0000 (Sun, 01 Nov 2009) Log Message: ----------- Fix crash when no render profiles Modified Paths: -------------- trunk/kdenlive/src/renderwidget.cpp Modified: trunk/kdenlive/src/renderwidget.cpp =================================================================== --- trunk/kdenlive/src/renderwidget.cpp 2009-11-01 09:38:15 UTC (rev 4080) +++ trunk/kdenlive/src/renderwidget.cpp 2009-11-01 10:04:49 UTC (rev 4081) @@ -294,6 +294,10 @@ } if (url != 0) { QListWidgetItem *item = m_view.size_list->currentItem(); + if (!item) { + m_view.buttonStart->setEnabled(false); + return; + } QString extension = item->data(ExtensionRole).toString(); url = filenameWithExtension(url, extension); m_view.out_file->setUrl(url); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dde...@us...> - 2009-11-30 01:57:11
|
Revision: 4159 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=4159&view=rev Author: ddennedy Date: 2009-11-30 01:56:59 +0000 (Mon, 30 Nov 2009) Log Message: ----------- Add legacy support for libfaac. Modified Paths: -------------- trunk/kdenlive/src/renderwidget.cpp Modified: trunk/kdenlive/src/renderwidget.cpp =================================================================== --- trunk/kdenlive/src/renderwidget.cpp 2009-11-30 01:52:54 UTC (rev 4158) +++ trunk/kdenlive/src/renderwidget.cpp 2009-11-30 01:56:59 UTC (rev 4159) @@ -1176,7 +1176,7 @@ bool replaceVorbisCodec = false; if (!acodecsList.contains("vorbis") && acodecsList.contains("libvorbis")) replaceVorbisCodec = true; bool replaceLibfaacCodec = false; - if (!acodecsList.contains("libfaac") && acodecsList.contains("aac")) replaceLibfaacCodec = true; + if (!acodecsList.contains("aac") && acodecsList.contains("libfaac")) replaceLibfaacCodec = true; if (editable || groups.count() == 0) { @@ -1230,9 +1230,9 @@ // replace vorbis with libvorbis params = params.replace("vorbis", "libvorbis"); } - if (replaceLibfaacCodec && params.contains("acodec=libfaac")) { + if (replaceLibfaacCodec && params.contains("acodec=aac")) { // replace libfaac with aac - params = params.replace("libfaac", "aac"); + params = params.replace("aac", "libfaac"); } QString category = profile.attribute("category", i18n("Custom")); @@ -1346,9 +1346,9 @@ // replace vorbis with libvorbis params = params.replace("vorbis", "libvorbis"); } - if (replaceLibfaacCodec && params.contains("acodec=libfaac")) { + if (replaceLibfaacCodec && params.contains("acodec=aac")) { // replace libfaac with aac - params = params.replace("libfaac", "aac"); + params = params.replace("aac", "libfaac"); } prof_extension = profileElement.attribute("extension"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-11-30 23:27:16
|
Revision: 4163 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=4163&view=rev Author: j-b-m Date: 2009-11-30 23:27:07 +0000 (Mon, 30 Nov 2009) Log Message: ----------- Do not allow to start running jobs: http://kdenlive.org/mantis/view.php?id=1320 Modified Paths: -------------- trunk/kdenlive/src/renderwidget.cpp Modified: trunk/kdenlive/src/renderwidget.cpp =================================================================== --- trunk/kdenlive/src/renderwidget.cpp 2009-11-30 23:15:55 UTC (rev 4162) +++ trunk/kdenlive/src/renderwidget.cpp 2009-11-30 23:27:07 UTC (rev 4163) @@ -1470,8 +1470,10 @@ bool activate = false; QTreeWidgetItem *current = m_view.running_jobs->currentItem(); if (current) { - if (current->data(1, Qt::UserRole + 2).toInt() == RUNNINGJOB) + if (current->data(1, Qt::UserRole + 2).toInt() == RUNNINGJOB) { m_view.abort_job->setText(i18n("Abort Job")); + m_view.start_job->setEnabled(false); + } else { m_view.abort_job->setText(i18n("Remove Job")); m_view.start_job->setEnabled(current->data(1, Qt::UserRole + 2).toInt() == WAITINGJOB); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tt...@us...> - 2010-04-24 19:36:02
|
Revision: 4398 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=4398&view=rev Author: ttill Date: 2010-04-24 19:35:54 +0000 (Sat, 24 Apr 2010) Log Message: ----------- Make preselected profile visible in render dialog Modified Paths: -------------- trunk/kdenlive/src/renderwidget.cpp Modified: trunk/kdenlive/src/renderwidget.cpp =================================================================== --- trunk/kdenlive/src/renderwidget.cpp 2010-04-24 19:29:43 UTC (rev 4397) +++ trunk/kdenlive/src/renderwidget.cpp 2010-04-24 19:35:54 UTC (rev 4398) @@ -1690,6 +1690,7 @@ QList<QListWidgetItem *> childs = m_view.format_list->findItems(group, Qt::MatchExactly); if (!childs.isEmpty()) { m_view.format_list->setCurrentItem(childs.at(0)); + m_view.format_list->scrollToItem(childs.at(0)); } refreshView(); } @@ -1698,6 +1699,7 @@ QList<QListWidgetItem *> childs = m_view.size_list->findItems(name, Qt::MatchExactly); if (!childs.isEmpty()) { m_view.size_list->setCurrentItem(childs.at(0)); + m_view.size_list->scrollToItem(childs.at(0)); } //refreshView(); m_view.destination_list->blockSignals(false); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dde...@us...> - 2010-06-18 03:21:35
|
Revision: 4521 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=4521&view=rev Author: ddennedy Date: 2010-06-18 03:21:29 +0000 (Fri, 18 Jun 2010) Log Message: ----------- Prefer the better quality Vorbis encoder, libvorbis, over the native. Modified Paths: -------------- trunk/kdenlive/src/renderwidget.cpp Modified: trunk/kdenlive/src/renderwidget.cpp =================================================================== --- trunk/kdenlive/src/renderwidget.cpp 2010-06-16 13:46:59 UTC (rev 4520) +++ trunk/kdenlive/src/renderwidget.cpp 2010-06-18 03:21:29 UTC (rev 4521) @@ -1233,7 +1233,7 @@ QListWidgetItem *item = NULL; const QStringList acodecsList = KdenliveSettings::audiocodecs(); bool replaceVorbisCodec = false; - if (!acodecsList.contains("vorbis") && acodecsList.contains("libvorbis")) replaceVorbisCodec = true; + if (acodecsList.contains("libvorbis")) replaceVorbisCodec = true; bool replaceLibfaacCodec = false; if (!acodecsList.contains("aac") && acodecsList.contains("libfaac")) replaceLibfaacCodec = true; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |