From: <j-...@us...> - 2008-09-25 13:05:35
|
Revision: 2410 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=2410&view=rev Author: j-b-m Date: 2008-09-25 11:51:34 +0000 (Thu, 25 Sep 2008) Log Message: ----------- Also check for MLT's SDL module at first run Modified Paths: -------------- branches/KDE4/src/wizard.cpp Modified: branches/KDE4/src/wizard.cpp =================================================================== --- branches/KDE4/src/wizard.cpp 2008-09-25 11:46:01 UTC (rev 2409) +++ branches/KDE4/src/wizard.cpp 2008-09-25 11:51:34 UTC (rev 2410) @@ -205,6 +205,16 @@ QByteArray result = checkProcess.readAllStandardError(); if (!result.contains("avformat")) errorMessage.append(i18n("MLT's avformat (FFMPEG) module not found. Please check your FFMPEG and MLT install. Kdenlive will not work until this issue is fixed.\n")); + QProcess checkProcess2; + checkProcess2.start(KdenliveSettings::rendererpath(), QStringList() << "-query" << "consumer"); + if (!checkProcess2.waitForStarted()) + errorMessage.append("Error starting MLT's command line player (inigo).\n"); + + checkProcess2.waitForFinished(); + + result = checkProcess2.readAllStandardError(); + if (!result.contains("sdl") || !result.contains("sdl_preview")) errorMessage.append(i18n("MLT's SDL module not found. Please check your MLT install. Kdenlive will not work until this issue is fixed.\n")); + if (!errorMessage.isEmpty()) { QLabel *pix = new QLabel(); pix->setPixmap(KIcon("process-stop").pixmap(30)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2008-09-30 20:16:04
|
Revision: 2418 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=2418&view=rev Author: j-b-m Date: 2008-09-30 20:15:48 +0000 (Tue, 30 Sep 2008) Log Message: ----------- Fix detection of MLT's avformat module Modified Paths: -------------- branches/KDE4/src/wizard.cpp Modified: branches/KDE4/src/wizard.cpp =================================================================== --- branches/KDE4/src/wizard.cpp 2008-09-28 02:00:34 UTC (rev 2417) +++ branches/KDE4/src/wizard.cpp 2008-09-30 20:15:48 UTC (rev 2418) @@ -203,7 +203,7 @@ checkProcess.waitForFinished(); QByteArray result = checkProcess.readAllStandardError(); - if (!result.contains("avformat")) errorMessage.append(i18n("MLT's avformat (FFMPEG) module not found. Please check your FFMPEG and MLT install. Kdenlive will not work until this issue is fixed.\n")); + if (!result.contains("- avformat")) errorMessage.append(i18n("MLT's avformat (FFMPEG) module not found. Please check your FFMPEG and MLT install. Kdenlive will not work until this issue is fixed.\n")); QProcess checkProcess2; checkProcess2.start(KdenliveSettings::rendererpath(), QStringList() << "-query" << "consumer"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2008-11-11 01:24:05
|
Revision: 2669 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=2669&view=rev Author: j-b-m Date: 2008-11-11 01:23:54 +0000 (Tue, 11 Nov 2008) Log Message: ----------- Add some of the new MLT HDV profiles as default choice for startup Modified Paths: -------------- branches/KDE4/src/wizard.cpp Modified: branches/KDE4/src/wizard.cpp =================================================================== --- branches/KDE4/src/wizard.cpp 2008-11-11 01:07:48 UTC (rev 2668) +++ branches/KDE4/src/wizard.cpp 2008-11-11 01:23:54 UTC (rev 2669) @@ -147,22 +147,26 @@ if (m_standard.button_dv->isChecked()) { profiles << "dv_pal" << "dv_pal_wide"; } else { - profiles << "hdv_720_25p" << "hdv_1080_50i"; + profiles << "hdv_720_25p" << "hdv_720_50p" << "hdv_1080_50i" << "hdv_1080_25p" << "atsc_1080p_24" << "atsc_1080p_25"; } } else { // NTSC standard if (m_standard.button_dv->isChecked()) { profiles << "dv_ntsc" << "dv_ntsc_wide"; } else { - profiles << "hdv_720_30p" << "hdv_1080_60i" << "atsc_720p_30" << "atsc_1080i_60"; + profiles << "hdv_720_30p" << "hdv_720_60p" << "hdv_1080_30p" << "hdv_1080_60i" << "atsc_720p_30" << "atsc_1080i_60"; } } m_standard.profiles_list->clear(); QStringList profilesDescription; foreach(const QString &prof, profiles) { - QListWidgetItem *item = new QListWidgetItem(ProfilesDialog::getProfileDescription(prof), m_standard.profiles_list); - item->setData(Qt::UserRole, prof); + QString desc = ProfilesDialog::getProfileDescription(prof); + if (!desc.isEmpty()) { + QListWidgetItem *item = new QListWidgetItem(desc, m_standard.profiles_list); + item->setData(Qt::UserRole, prof); + } } + m_standard.profiles_list->setSortingEnabled(true); m_standard.profiles_list->setCurrentRow(0); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2008-11-17 10:11:14
|
Revision: 2709 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=2709&view=rev Author: j-b-m Date: 2008-11-17 10:11:06 +0000 (Mon, 17 Nov 2008) Log Message: ----------- Add *.mod as mpeg extension when installing extra mime types, should fix: http://www.kdenlive.org/mantis/view.php?id=357 Modified Paths: -------------- branches/KDE4/src/wizard.cpp Modified: branches/KDE4/src/wizard.cpp =================================================================== --- branches/KDE4/src/wizard.cpp 2008-11-17 10:08:44 UTC (rev 2708) +++ branches/KDE4/src/wizard.cpp 2008-11-17 10:11:06 UTC (rev 2709) @@ -179,7 +179,7 @@ void Wizard::adjustSettings() { if (m_extra.installmimes->isChecked()) { QStringList globs; - globs << "*.mts" << "*.m2t"; + globs << "*.mts" << "*.m2t" << "*.mod"; installExtraMimes("video/mpeg", globs); globs.clear(); globs << "*.dv"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2008-12-08 23:49:55
|
Revision: 2767 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=2767&view=rev Author: j-b-m Date: 2008-12-08 23:49:46 +0000 (Mon, 08 Dec 2008) Log Message: ----------- Wizard will now add *.mts as a valid mpeg extension Modified Paths: -------------- branches/KDE4/src/wizard.cpp Modified: branches/KDE4/src/wizard.cpp =================================================================== --- branches/KDE4/src/wizard.cpp 2008-12-08 23:47:11 UTC (rev 2766) +++ branches/KDE4/src/wizard.cpp 2008-12-08 23:49:46 UTC (rev 2767) @@ -179,7 +179,7 @@ void Wizard::adjustSettings() { if (m_extra.installmimes->isChecked()) { QStringList globs; - globs << "*.mts" << "*.m2t" << "*.mod"; + globs << "*.mts" << "*.m2t" << "*.mod" << "*.mts"; installExtraMimes("video/mpeg", globs); globs.clear(); globs << "*.dv"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2008-12-09 00:16:54
|
Revision: 2768 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=2768&view=rev Author: j-b-m Date: 2008-12-09 00:16:48 +0000 (Tue, 09 Dec 2008) Log Message: ----------- Add *.ts extension to mpeg instead of adding *.mts twice... Modified Paths: -------------- branches/KDE4/src/wizard.cpp Modified: branches/KDE4/src/wizard.cpp =================================================================== --- branches/KDE4/src/wizard.cpp 2008-12-08 23:49:46 UTC (rev 2767) +++ branches/KDE4/src/wizard.cpp 2008-12-09 00:16:48 UTC (rev 2768) @@ -179,7 +179,7 @@ void Wizard::adjustSettings() { if (m_extra.installmimes->isChecked()) { QStringList globs; - globs << "*.mts" << "*.m2t" << "*.mod" << "*.mts"; + globs << "*.mts" << "*.m2t" << "*.mod" << "*.ts"; installExtraMimes("video/mpeg", globs); globs.clear(); globs << "*.dv"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2008-12-16 19:22:06
|
Revision: 2795 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=2795&view=rev Author: j-b-m Date: 2008-12-16 19:22:02 +0000 (Tue, 16 Dec 2008) Log Message: ----------- Add missing i18n strings Modified Paths: -------------- branches/KDE4/src/wizard.cpp Modified: branches/KDE4/src/wizard.cpp =================================================================== --- branches/KDE4/src/wizard.cpp 2008-12-16 19:21:10 UTC (rev 2794) +++ branches/KDE4/src/wizard.cpp 2008-12-16 19:22:02 UTC (rev 2795) @@ -105,28 +105,28 @@ KIcon missingIcon("dialog-close"); m_check.programList->setColumnWidth(0, 30); m_check.programList->setIconSize(QSize(24, 24)); - QTreeWidgetItem *item = new QTreeWidgetItem(m_check.programList, QStringList() << QString() << "FFmpeg & ffplay"); - item->setData(1, Qt::UserRole, QString("Required for webcam capture")); + QTreeWidgetItem *item = new QTreeWidgetItem(m_check.programList, QStringList() << QString() << i18n("FFmpeg & ffplay")); + item->setData(1, Qt::UserRole, i18n("Required for webcam capture")); item->setSizeHint(0, itemSize); QString exepath = KStandardDirs::findExe("ffmpeg"); if (exepath.isEmpty()) item->setIcon(0, missingIcon); else if (KStandardDirs::findExe("ffplay").isEmpty()) item->setIcon(0, missingIcon); else item->setIcon(0, okIcon); - item = new QTreeWidgetItem(m_check.programList, QStringList() << QString() << "Recordmydesktop"); - item->setData(1, Qt::UserRole, QString("Required for screen capture")); + item = new QTreeWidgetItem(m_check.programList, QStringList() << QString() << i18n("Recordmydesktop")); + item->setData(1, Qt::UserRole, i18n("Required for screen capture")); item->setSizeHint(0, itemSize); if (KStandardDirs::findExe("recordmydesktop").isEmpty()) item->setIcon(0, missingIcon); else item->setIcon(0, okIcon); - item = new QTreeWidgetItem(m_check.programList, QStringList() << QString() << "Dvgrab"); - item->setData(1, Qt::UserRole, QString("Required for firewire capture")); + item = new QTreeWidgetItem(m_check.programList, QStringList() << QString() << i18n("Dvgrab")); + item->setData(1, Qt::UserRole, i18n("Required for firewire capture")); item->setSizeHint(0, itemSize); if (KStandardDirs::findExe("dvgrab").isEmpty()) item->setIcon(0, missingIcon); else item->setIcon(0, okIcon); - item = new QTreeWidgetItem(m_check.programList, QStringList() << QString() << "Inigo"); - item->setData(1, Qt::UserRole, QString("Required for rendering (part of MLT package)")); + item = new QTreeWidgetItem(m_check.programList, QStringList() << QString() << i18n("Inigo")); + item->setData(1, Qt::UserRole, i18n("Required for rendering (part of MLT package)")); item->setSizeHint(0, itemSize); if (KStandardDirs::findExe("inigo").isEmpty()) item->setIcon(0, missingIcon); else item->setIcon(0, okIcon); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-02-02 22:16:44
|
Revision: 3026 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3026&view=rev Author: j-b-m Date: 2009-02-02 22:16:39 +0000 (Mon, 02 Feb 2009) Log Message: ----------- Detect MLT version and don't query for available codecs if version < 0.3.5. Workaround for bug: http://www.kdenlive.org:80/mantis/view.php?id=653 Modified Paths: -------------- branches/KDE4/src/wizard.cpp Modified: branches/KDE4/src/wizard.cpp =================================================================== --- branches/KDE4/src/wizard.cpp 2009-02-01 15:48:37 UTC (rev 3025) +++ branches/KDE4/src/wizard.cpp 2009-02-02 22:16:39 UTC (rev 3026) @@ -141,68 +141,98 @@ m_mltCheck.tabWidget->setTabEnabled(1, false); } else { avformatItem->setIcon(0, okIcon); - // Check installed audio codecs - QProcess checkProcess2; - checkProcess2.start(KdenliveSettings::rendererpath(), QStringList() << "noise:" << "-consumer" << "avformat" << "acodec=list"); - if (!checkProcess2.waitForStarted()) { - m_mltCheck.tabWidget->setTabEnabled(1, false); - kDebug() << "// Error parsing MLT's avformat codecs"; - } else { - checkProcess2.waitForFinished(); - QByteArray codecList = checkProcess2.readAllStandardError(); - QString acodecList(codecList); - QStringList result; - QStringList alist = acodecList.split("\n", QString::SkipEmptyParts); - for (int i = 0; i < alist.count(); i++) { - if (alist.at(i).contains("- ")) result.append(alist.at(i).section("- ", 1).simplified().toLower()); + // Make sure we have MLT > 0.3.4 + bool recentMlt = false; + QString exepath = KStandardDirs::findExe("pkg-config"); + if (!exepath.isEmpty()) { + checkProcess.start(exepath, QStringList() << "--variable=version" << "mlt-framework"); + if (!checkProcess.waitForStarted()) { + kDebug() << "// Error querying MLT's version"; + } else { + checkProcess.waitForFinished(); + QString mltVersion = checkProcess.readAllStandardOutput(); + int version = 100 * mltVersion.section('.', 0, 0).toInt() + 10 * mltVersion.section('.', 1, 1).toInt() + mltVersion.section('.', 2, 2).toInt(); + kDebug() << "// FOUND MLT's pkgconfig version: " << version; + if (version > 34) recentMlt = true; } - m_mltCheck.acodecs_list->addItems(result); - KdenliveSettings::setAudiocodecs(result); - //kDebug()<<"// FOUND LIST:\n\n"<<m_audioCodecs<<"\n\n++++++++++++++++++++"; - } - // Check video codecs - checkProcess2.start(KdenliveSettings::rendererpath(), QStringList() << "noise:" << "-consumer" << "avformat" << "vcodec=list"); - if (!checkProcess2.waitForStarted()) { - kDebug() << "// Error parsing MLT's avformat codecs"; } else { - checkProcess2.waitForFinished(); - QByteArray codecList = checkProcess2.readAllStandardError(); - QString vcodecList(codecList); - QStringList result; - QStringList vlist = vcodecList.split("\n", QString::SkipEmptyParts); - for (int i = 0; i < vlist.count(); i++) { - if (vlist.at(i).contains("- ")) result.append(vlist.at(i).section("- ", 1).simplified().toLower()); + checkProcess.start(KdenliveSettings::rendererpath(), QStringList() << "--version"); + if (!checkProcess.waitForStarted()) { + kDebug() << "// Error querying MLT's version"; + } else { + checkProcess.waitForFinished(); + QString mltVersion = checkProcess.readAllStandardError(); + mltVersion = mltVersion.section("\n", 0, 0).simplified(); + mltVersion = mltVersion.section(' ', -1).simplified(); + int version = 100 * mltVersion.section('.', 0, 0).toInt() + 10 * mltVersion.section('.', 1, 1).toInt() + mltVersion.section('.', 2, 2).toInt(); + kDebug() << "// FOUND MLT version: " << version; + if (version > 34) recentMlt = true; } - m_mltCheck.vcodecs_list->addItems(result); - KdenliveSettings::setVideocodecs(result); - //kDebug()<<"// FOUND LIST:\n\n"<<m_videoCodecs<<"\n\n++++++++++++++++++++"; } - // Check formats - checkProcess2.start(KdenliveSettings::rendererpath(), QStringList() << "noise:" << "-consumer" << "avformat" << "f=list"); - if (!checkProcess2.waitForStarted()) { - kDebug() << "// Error parsing MLT's avformat codecs"; - } else { - checkProcess2.waitForFinished(); - QByteArray codecList = checkProcess2.readAllStandardError(); - QString vcodecList(codecList); - QStringList result; - QStringList vlist = vcodecList.split("\n", QString::SkipEmptyParts); - for (int i = 0; i < vlist.count(); i++) { - if (vlist.at(i).contains("- ")) { - QString format = vlist.at(i).section("- ", 1).simplified().toLower(); - if (format.contains(',')) { - QStringList sub = format.split(',', QString::SkipEmptyParts); - for (int j = 0; j < sub.count(); j++) - result.append(sub.at(j)); - } else result.append(format); + + if (recentMlt) { + // Check installed audio codecs + QProcess checkProcess2; + checkProcess2.start(KdenliveSettings::rendererpath(), QStringList() << "noise:" << "-consumer" << "avformat" << "acodec=list"); + if (!checkProcess2.waitForStarted()) { + m_mltCheck.tabWidget->setTabEnabled(1, false); + kDebug() << "// Error parsing MLT's avformat codecs"; + } else { + checkProcess2.waitForFinished(); + QByteArray codecList = checkProcess2.readAllStandardError(); + QString acodecList(codecList); + QStringList result; + QStringList alist = acodecList.split("\n", QString::SkipEmptyParts); + for (int i = 0; i < alist.count(); i++) { + if (alist.at(i).contains("- ")) result.append(alist.at(i).section("- ", 1).simplified().toLower()); } + m_mltCheck.acodecs_list->addItems(result); + KdenliveSettings::setAudiocodecs(result); + //kDebug()<<"// FOUND LIST:\n\n"<<m_audioCodecs<<"\n\n++++++++++++++++++++"; } - m_mltCheck.formats_list->addItems(result); - KdenliveSettings::setSupportedformats(result); - //kDebug()<<"// FOUND LIST:\n\n"<<m_videoCodecs<<"\n\n++++++++++++++++++++"; + // Check video codecs + checkProcess2.start(KdenliveSettings::rendererpath(), QStringList() << "noise:" << "-consumer" << "avformat" << "vcodec=list"); + if (!checkProcess2.waitForStarted()) { + kDebug() << "// Error parsing MLT's avformat codecs"; + } else { + checkProcess2.waitForFinished(); + QByteArray codecList = checkProcess2.readAllStandardError(); + QString vcodecList(codecList); + QStringList result; + QStringList vlist = vcodecList.split("\n", QString::SkipEmptyParts); + for (int i = 0; i < vlist.count(); i++) { + if (vlist.at(i).contains("- ")) result.append(vlist.at(i).section("- ", 1).simplified().toLower()); + } + m_mltCheck.vcodecs_list->addItems(result); + KdenliveSettings::setVideocodecs(result); + //kDebug()<<"// FOUND LIST:\n\n"<<m_videoCodecs<<"\n\n++++++++++++++++++++"; + } + // Check formats + checkProcess2.start(KdenliveSettings::rendererpath(), QStringList() << "noise:" << "-consumer" << "avformat" << "f=list"); + if (!checkProcess2.waitForStarted()) { + kDebug() << "// Error parsing MLT's avformat codecs"; + } else { + checkProcess2.waitForFinished(); + QByteArray codecList = checkProcess2.readAllStandardError(); + QString vcodecList(codecList); + QStringList result; + QStringList vlist = vcodecList.split("\n", QString::SkipEmptyParts); + for (int i = 0; i < vlist.count(); i++) { + if (vlist.at(i).contains("- ")) { + QString format = vlist.at(i).section("- ", 1).simplified().toLower(); + if (format.contains(',')) { + QStringList sub = format.split(',', QString::SkipEmptyParts); + for (int j = 0; j < sub.count(); j++) + result.append(sub.at(j)); + } else result.append(format); + } + } + m_mltCheck.formats_list->addItems(result); + KdenliveSettings::setSupportedformats(result); + //kDebug()<<"// FOUND LIST:\n\n"<<m_videoCodecs<<"\n\n++++++++++++++++++++"; + } } - } // Check MLT dv module This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-02-11 12:49:55
|
Revision: 3045 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3045&view=rev Author: j-b-m Date: 2009-02-11 12:25:11 +0000 (Wed, 11 Feb 2009) Log Message: ----------- Fix detection of MLT's version when pkgconfig info is not present Modified Paths: -------------- branches/KDE4/src/wizard.cpp Modified: branches/KDE4/src/wizard.cpp =================================================================== --- branches/KDE4/src/wizard.cpp 2009-02-11 12:18:56 UTC (rev 3044) +++ branches/KDE4/src/wizard.cpp 2009-02-11 12:25:11 UTC (rev 3045) @@ -143,6 +143,7 @@ avformatItem->setIcon(0, okIcon); // Make sure we have MLT > 0.3.4 bool recentMlt = false; + int version = 0; QString exepath = KStandardDirs::findExe("pkg-config"); if (!exepath.isEmpty()) { checkProcess.start(exepath, QStringList() << "--variable=version" << "mlt-framework"); @@ -151,11 +152,12 @@ } else { checkProcess.waitForFinished(); QString mltVersion = checkProcess.readAllStandardOutput(); - int version = 100 * mltVersion.section('.', 0, 0).toInt() + 10 * mltVersion.section('.', 1, 1).toInt() + mltVersion.section('.', 2, 2).toInt(); + version = 100 * mltVersion.section('.', 0, 0).toInt() + 10 * mltVersion.section('.', 1, 1).toInt() + mltVersion.section('.', 2, 2).toInt(); kDebug() << "// FOUND MLT's pkgconfig version: " << version; if (version > 34) recentMlt = true; } - } else { + } + if (version == 0) { checkProcess.start(KdenliveSettings::rendererpath(), QStringList() << "--version"); if (!checkProcess.waitForStarted()) { kDebug() << "// Error querying MLT's version"; @@ -164,7 +166,7 @@ QString mltVersion = checkProcess.readAllStandardError(); mltVersion = mltVersion.section("\n", 0, 0).simplified(); mltVersion = mltVersion.section(' ', -1).simplified(); - int version = 100 * mltVersion.section('.', 0, 0).toInt() + 10 * mltVersion.section('.', 1, 1).toInt() + mltVersion.section('.', 2, 2).toInt(); + version = 100 * mltVersion.section('.', 0, 0).toInt() + 10 * mltVersion.section('.', 1, 1).toInt() + mltVersion.section('.', 2, 2).toInt(); kDebug() << "// FOUND MLT version: " << version; if (version > 34) recentMlt = true; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |