X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fwizard.cpp;h=7267e4bc9d5502104cd8d5278a6003cd446dd454;hb=c3302003093710ee247ad84c0fe2ef3c579d417f;hp=410101b6e07df3401646d709e8cb7d9a4b0d2180;hpb=5881fda044765e2a979c9243a71a724285bc4933;p=kdenlive
diff --git a/src/wizard.cpp b/src/wizard.cpp
index 410101b6..7267e4bc 100644
--- a/src/wizard.cpp
+++ b/src/wizard.cpp
@@ -49,7 +49,7 @@
// Recommended MLT version
const int mltVersionMajor = 0;
const int mltVersionMinor = 8;
-const int mltVersionRevision = 0;
+const int mltVersionRevision = 8;
static const char kdenlive_version[] = VERSION;
@@ -113,7 +113,7 @@ Wizard::Wizard(bool upgrade, QWidget *parent) :
// select default profile
if (!KdenliveSettings::default_profile().isEmpty()) {
- for (int i = 0; i < m_standard.profiles_list->count(); i++) {
+ for (int i = 0; i < m_standard.profiles_list->count(); ++i) {
if (m_standard.profiles_list->item(i)->data(Qt::UserRole).toString() == KdenliveSettings::default_profile()) {
m_standard.profiles_list->setCurrentRow(i);
m_standard.profiles_list->scrollToItem(m_standard.profiles_list->currentItem());
@@ -172,7 +172,7 @@ void Wizard::slotDetectWebcam()
m_capture.v4l_devices->clear();
// Video 4 Linux device detection
- for (int i = 0; i < 10; i++) {
+ for (int i = 0; i < 10; ++i) {
QString path = "/dev/video" + QString::number(i);
if (QFile::exists(path)) {
QStringList deviceInfo = V4lCaptureHandler::getDeviceName(path.toUtf8().constData());
@@ -186,7 +186,7 @@ void Wizard::slotDetectWebcam()
m_capture.v4l_status->setText(i18n("Default video4linux device:"));
// select default device
bool found = false;
- for (int i = 0; i < m_capture.v4l_devices->count(); i++) {
+ for (int i = 0; i < m_capture.v4l_devices->count(); ++i) {
QString device = m_capture.v4l_devices->itemData(i).toString();
if (device == KdenliveSettings::video4vdevice()) {
m_capture.v4l_devices->setCurrentIndex(i);
@@ -220,7 +220,7 @@ void Wizard::slotUpdateCaptureParameters()
QString itemSize;
QString pixelFormat;
QStringList itemRates;
- for (int i = 0; i < pixelformats.count(); i++) {
+ for (int i = 0; i < pixelformats.count(); ++i) {
QString format = pixelformats.at(i).section(':', 0, 0);
QStringList sizes = pixelformats.at(i).split(':', QString::SkipEmptyParts);
pixelFormat = sizes.takeFirst();
@@ -344,23 +344,23 @@ void Wizard::checkMltComponents()
consumer->start();
QStringList result;
Mlt::Properties vcodecs((mlt_properties) consumer->get_data("vcodec"));
- for (int i = 0; i < vcodecs.count(); i++)
+ for (int i = 0; i < vcodecs.count(); ++i)
result << QString(vcodecs.get(i));
m_mltCheck.vcodecs_list->addItems(result);
KdenliveSettings::setVideocodecs(result);
result.clear();
Mlt::Properties acodecs((mlt_properties) consumer->get_data("acodec"));
- for (int i = 0; i < acodecs.count(); i++)
+ for (int i = 0; i < acodecs.count(); ++i)
result << QString(acodecs.get(i));
m_mltCheck.acodecs_list->addItems(result);
KdenliveSettings::setAudiocodecs(result);
result.clear();
Mlt::Properties formats((mlt_properties) consumer->get_data("f"));
- for (int i = 0; i < formats.count(); i++)
+ for (int i = 0; i < formats.count(); ++i)
result << QString(formats.get(i));
m_mltCheck.formats_list->addItems(result);
KdenliveSettings::setSupportedformats(result);
- checkMissingCodecs();
+ checkMissingCodecs();
delete consumer;
}
@@ -428,63 +428,63 @@ void Wizard::checkMissingCodecs()
QStringList requiredACodecs;
QStringList requiredVCodecs;
foreach(const QString &filename, fileList) {
- QDomDocument doc;
- QFile file(exportFolder + filename);
- doc.setContent(&file, false);
- file.close();
- QString std;
- QString format;
- QDomNodeList profiles = doc.elementsByTagName("profile");
- for (int i = 0; i < profiles.count(); i++) {
- std = profiles.at(i).toElement().attribute("args");
- format.clear();
+ QDomDocument doc;
+ QFile file(exportFolder + filename);
+ doc.setContent(&file, false);
+ file.close();
+ QString std;
+ QString format;
+ QDomNodeList profiles = doc.elementsByTagName("profile");
+ for (int i = 0; i < profiles.count(); ++i) {
+ std = profiles.at(i).toElement().attribute("args");
+ format.clear();
if (std.startsWith("acodec=")) format = std.section("acodec=", 1, 1);
- else if (std.contains(" acodec=")) format = std.section(" acodec=", 1, 1);
+ else if (std.contains(" acodec=")) format = std.section(" acodec=", 1, 1);
if (!format.isEmpty()) requiredACodecs << format.section(' ', 0, 0).toLower();
- format.clear();
+ format.clear();
if (std.startsWith("vcodec=")) format = std.section("vcodec=", 1, 1);
- else if (std.contains(" vcodec=")) format = std.section(" vcodec=", 1, 1);
+ else if (std.contains(" vcodec=")) format = std.section(" vcodec=", 1, 1);
if (!format.isEmpty()) requiredVCodecs << format.section(' ', 0, 0).toLower();
- }
+ }
}
requiredACodecs.removeDuplicates();
requiredVCodecs.removeDuplicates();
if (replaceVorbisCodec) requiredACodecs.replaceInStrings("vorbis", "libvorbis");
if (replaceLibfaacCodec) requiredACodecs.replaceInStrings("aac", "libfaac");
- for (int i = 0; i < acodecsList.count(); i++)
- requiredACodecs.removeAll(acodecsList.at(i));
- for (int i = 0; i < vcodecsList.count(); i++)
- requiredVCodecs.removeAll(vcodecsList.at(i));
+ for (int i = 0; i < acodecsList.count(); ++i)
+ requiredACodecs.removeAll(acodecsList.at(i));
+ for (int i = 0; i < vcodecsList.count(); ++i)
+ requiredVCodecs.removeAll(vcodecsList.at(i));
if (!requiredACodecs.isEmpty() || !requiredVCodecs.isEmpty()) {
- QString missing = requiredACodecs.join(",");
- if (!missing.isEmpty() && !requiredVCodecs.isEmpty()) missing.append(',');
- missing.append(requiredVCodecs.join(","));
- missing.prepend(i18n("The following codecs were not found on your system. Check our online manual if you need them: "));
- // Some codecs required for rendering are not present on this system, warn user
- show();
+ QString missing = requiredACodecs.join(",");
+ if (!missing.isEmpty() && !requiredVCodecs.isEmpty()) missing.append(',');
+ missing.append(requiredVCodecs.join(","));
+ missing.prepend(i18n("The following codecs were not found on your system. Check our online manual if you need them: "));
+ // Some codecs required for rendering are not present on this system, warn user
+ show();
#if KDE_IS_VERSION(4,7,0)
KMessageWidget *infoMessage = new KMessageWidget(this);
m_startLayout->insertWidget(1, infoMessage);
infoMessage->setCloseButtonVisible(false);
infoMessage->setWordWrap(true);
- infoMessage->setMessageType(KMessageWidget::Warning);
+ infoMessage->setMessageType(KMessageWidget::Warning);
#if KDE_IS_VERSION(4,10,0)
- connect(infoMessage, SIGNAL(linkActivated (const QString &)), this, SLOT(slotOpenManual()));
- infoMessage->setText(missing);
+ connect(infoMessage, SIGNAL(linkActivated(QString)), this, SLOT(slotOpenManual()));
+ infoMessage->setText(missing);
#else
- // clickable text in kmessagewidget only available since KDE 4.10
- // remove link from text
- missing.remove(QRegExp("<[^>]*>"));
+ // clickable text in kmessagewidget only available since KDE 4.10
+ // remove link from text
+ missing.remove(QRegExp("<[^>]*>"));
infoMessage->setText(missing);
- QAction *manualAction = new QAction(i18n("Check online manual"), this);
- connect(manualAction, SIGNAL(triggered()), this, SLOT(slotOpenManual()));
- infoMessage->addAction(manualAction);
+ QAction *manualAction = new QAction(i18n("Check online manual"), this);
+ connect(manualAction, SIGNAL(triggered()), this, SLOT(slotOpenManual()));
+ infoMessage->addAction(manualAction);
#endif
infoMessage->animatedShow();
#else
- m_welcomeLabel->setText(m_welcomeLabel->text() + "