X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fkdenlivedoc.cpp;h=8102ca681918534ca9bd7758d54239d9ad056af1;hb=dec4e4c60fabbd22d90ea55e34f59948e30a35a4;hp=35355db0e74b989442973f1d21e2085d218b3198;hpb=8094288cefb96c161d2bdbfc6ace594530ec16bc;p=kdenlive diff --git a/src/kdenlivedoc.cpp b/src/kdenlivedoc.cpp index 35355db0..8102ca68 100644 --- a/src/kdenlivedoc.cpp +++ b/src/kdenlivedoc.cpp @@ -28,7 +28,7 @@ #include "mainwindow.h" #include "documentchecker.h" #include "documentvalidator.h" -#include "kdenlive-config.h" +#include "config-kdenlive.h" #include "initeffects.h" #include @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include @@ -52,9 +53,12 @@ #include -const double DOCUMENTVERSION = 0.86; +#include "locale.h" -KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup *undoGroup, QString profileName, QMap properties, const QPoint tracks, Render *render, KTextEdit *notes, bool *openBackup, MainWindow *parent, KProgressDialog *progressDialog) : + +const double DOCUMENTVERSION = 0.88; + +KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup *undoGroup, QString profileName, QMap properties, const QPoint &tracks, Render *render, KTextEdit *notes, bool *openBackup, MainWindow *parent, KProgressDialog *progressDialog) : QObject(parent), m_autosave(NULL), m_url(url), @@ -64,9 +68,22 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup m_modified(false), m_projectFolder(projectFolder) { + // init m_profile struct + m_profile.frame_rate_num = 0; + m_profile.frame_rate_den = 0; + m_profile.width = 0; + m_profile.height = 0; + m_profile.progressive = 0; + m_profile.sample_aspect_num = 0; + m_profile.sample_aspect_den = 0; + m_profile.display_aspect_num = 0; + m_profile.display_aspect_den = 0; + m_profile.colorspace = 0; + m_clipManager = new ClipManager(this); m_autoSaveTimer = new QTimer(this); m_autoSaveTimer->setSingleShot(true); + connect(m_clipManager, SIGNAL(displayMessage(QString, int)), parent, SLOT(slotGotProgressInfo(QString,int))); bool success = false; // init default document properties @@ -81,7 +98,13 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup m_documentProperties["proxyminsize"] = QString::number(KdenliveSettings::proxyminsize()); m_documentProperties["generateimageproxy"] = QString::number((int) KdenliveSettings::generateimageproxy()); m_documentProperties["proxyimageminsize"] = QString::number(KdenliveSettings::proxyimageminsize()); - +#if QT_VERSION >= 0x040700 + m_documentProperties["documentid"] = QString::number(QDateTime::currentMSecsSinceEpoch()); +#else + QDateTime date = QDateTime::currentDateTime(); + m_documentProperties["documentid"] = QString::number(date.toTime_t()); +#endif + // Load properties QMapIterator i(properties); while (i.hasNext()) { @@ -89,6 +112,15 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup m_documentProperties[i.key()] = i.value(); } + if (QLocale().decimalPoint() != QLocale::system().decimalPoint()) { + setlocale(LC_NUMERIC, ""); + QLocale systemLocale = QLocale::system(); + systemLocale.setNumberOptions(QLocale::OmitGroupSeparator); + QLocale::setDefault(systemLocale); + // locale conversion might need to be redone + initEffects::parseEffectFiles(); + } + *openBackup = false; if (!url.isEmpty()) { @@ -146,6 +178,9 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup QDomElement mlt = m_document.firstChildElement("mlt"); QDomElement infoXml = mlt.firstChildElement("kdenlivedoc"); + // Set profile, fps, etc for the document + setProfilePath(infoXml.attribute("profile")); + // Check embedded effects QDomElement customeffects = infoXml.firstChildElement("customeffects"); if (!customeffects.isNull() && customeffects.hasChildNodes()) { @@ -251,7 +286,7 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup QDomNamedNodeMap props = docproperties.attributes(); for (int i = 0; i < props.count(); i++) m_documentProperties.insert(props.item(i).nodeName(), props.item(i).nodeValue()); - setProfilePath(infoXml.attribute("profile")); + if (validator.isModified()) setModified(true); kDebug() << "Reading file: " << url.path() << ", found clips: " << producers.count(); } @@ -261,7 +296,7 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup } } } - + // Something went wrong, or a new file was requested: create a new project if (!success) { m_url.clear(); @@ -269,9 +304,6 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup m_document = createEmptyDocument(tracks.x(), tracks.y()); } - // Set the video profile (empty == default) - KdenliveSettings::setCurrent_profile(profilePath()); - // Ask to create the project directory if it does not exist if (!QFile::exists(m_projectFolder.path())) { int create = KMessageBox::questionYesNo(parent, i18n("Project directory %1 does not exist. Create it?", m_projectFolder.path())); @@ -293,7 +325,6 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup // Make sure that the necessary folders exist KStandardDirs::makeDir(m_projectFolder.path(KUrl::AddTrailingSlash) + "titles/"); KStandardDirs::makeDir(m_projectFolder.path(KUrl::AddTrailingSlash) + "thumbs/"); - KStandardDirs::makeDir(m_projectFolder.path(KUrl::AddTrailingSlash) + "ladspa/"); KStandardDirs::makeDir(m_projectFolder.path(KUrl::AddTrailingSlash) + "proxy/"); updateProjectFolderPlacesEntry(); @@ -318,7 +349,7 @@ KdenliveDoc::~KdenliveDoc() int KdenliveDoc::setSceneList() { - m_render->resetProfile(KdenliveSettings::current_profile()); + m_render->resetProfile(KdenliveSettings::current_profile(), true); if (m_render->setSceneList(m_document.toString(), m_documentProperties.value("position").toInt()) == -1) { // INVALID MLT Consumer, something is wrong return -1; @@ -365,9 +396,9 @@ QDomDocument KdenliveDoc::createEmptyDocument(QList tracks) // Creating new document QDomDocument doc; QDomElement mlt = doc.createElement("mlt"); + mlt.setAttribute("LC_NUMERIC", ""); doc.appendChild(mlt); - - + // Create black producer // For some unknown reason, we have to build the black producer here and not in renderer.cpp, otherwise // the composite transitions with the black track are corrupted. @@ -384,7 +415,7 @@ QDomDocument KdenliveDoc::createEmptyDocument(QList tracks) property = doc.createElement("property"); property.setAttribute("name", "aspect_ratio"); - value = doc.createTextNode(QString::number(0.0)); + value = doc.createTextNode(QString::number(0)); property.appendChild(value); blk.appendChild(property); @@ -550,7 +581,7 @@ QPoint KdenliveDoc::zone() const return QPoint(m_documentProperties.value("zonein").toInt(), m_documentProperties.value("zoneout").toInt()); } -QDomDocument KdenliveDoc::xmlSceneList(const QString &scene, const QStringList expandedFolders) +QDomDocument KdenliveDoc::xmlSceneList(const QString &scene, const QStringList &expandedFolders) { QDomDocument sceneList; sceneList.setContent(scene, true); @@ -560,6 +591,18 @@ QDomDocument KdenliveDoc::xmlSceneList(const QString &scene, const QStringList e return sceneList; } + // Set playlist audio volume to 100% + QDomElement tractor = mlt.firstChildElement("tractor"); + if (!tractor.isNull()) { + QDomNodeList props = tractor.elementsByTagName("property"); + for (int i = 0; i < props.count(); i++) { + if (props.at(i).toElement().attribute("name") == "meta.volume") { + props.at(i).firstChild().setNodeValue("1"); + break; + } + } + } + QDomElement addedXml = sceneList.createElement("kdenlivedoc"); mlt.appendChild(addedXml); @@ -675,7 +718,7 @@ QDomDocument KdenliveDoc::xmlSceneList(const QString &scene, const QStringList e return sceneList; } -bool KdenliveDoc::saveSceneList(const QString &path, const QString &scene, const QStringList expandedFolders, bool autosave) +bool KdenliveDoc::saveSceneList(const QString &path, const QString &scene, const QStringList &expandedFolders, bool autosave) { QDomDocument sceneList = xmlSceneList(scene, expandedFolders); if (sceneList.isNull()) { @@ -703,6 +746,15 @@ bool KdenliveDoc::saveSceneList(const QString &path, const QString &scene, const file.close(); if (!autosave) { cleanupBackupFiles(); + QFileInfo info(file); + QString fileName = KUrl(path).fileName().section('.', 0, -2); + fileName.append("-" + m_documentProperties.value("documentid")); + fileName.append(info.lastModified().toString("-yyyy-MM-dd-hh-mm")); + fileName.append(".kdenlive.png"); + KUrl backupFile = m_projectFolder; + backupFile.addPath(".backup/"); + backupFile.addPath(fileName); + emit saveTimelinePreview(backupFile.path()); } return true; } @@ -734,7 +786,7 @@ void KdenliveDoc::setProjectFolder(KUrl url) void KdenliveDoc::moveProjectData(KUrl url) { QList list = m_clipManager->documentClipList(); - //TODO: Also move ladspa effects files + KUrl::List cacheUrls; for (int i = 0; i < list.count(); i++) { DocClipBase *clip = list.at(i); if (clip->clipType() == TEXT) { @@ -748,16 +800,17 @@ void KdenliveDoc::moveProjectData(KUrl url) KUrl oldVideoThumbUrl = KUrl(m_projectFolder.path(KUrl::AddTrailingSlash) + "thumbs/" + hash + ".png"); KUrl oldAudioThumbUrl = KUrl(m_projectFolder.path(KUrl::AddTrailingSlash) + "thumbs/" + hash + ".thumb"); if (KIO::NetAccess::exists(oldVideoThumbUrl, KIO::NetAccess::SourceSide, 0)) { - KUrl newUrl = KUrl(url.path(KUrl::AddTrailingSlash) + "thumbs/" + hash + ".png"); - KIO::Job *job = KIO::copy(oldVideoThumbUrl, newUrl); - KIO::NetAccess::synchronousRun(job, 0); + cacheUrls << oldVideoThumbUrl; } if (KIO::NetAccess::exists(oldAudioThumbUrl, KIO::NetAccess::SourceSide, 0)) { - KUrl newUrl = KUrl(url.path(KUrl::AddTrailingSlash) + "thumbs/" + hash + ".thumb"); - KIO::Job *job = KIO::copy(oldAudioThumbUrl, newUrl); - if (KIO::NetAccess::synchronousRun(job, 0)) clip->refreshThumbUrl(); + cacheUrls << oldAudioThumbUrl; } } + if (!cacheUrls.isEmpty()) { + KIO::Job *job = KIO::copy(cacheUrls, KUrl(url.path(KUrl::AddTrailingSlash) + "thumbs/")); + job->ui()->setWindow(kapp->activeWindow()); + KIO::NetAccess::synchronousRun(job, 0); + } } const QString &KdenliveDoc::profilePath() const @@ -827,6 +880,7 @@ bool KdenliveDoc::setProfilePath(QString path) m_height = m_profile.height; kDebug() << "Kdenlive document, init timecode from path: " << path << ", " << m_fps; m_timecode.setFormat(m_fps); + KdenliveSettings::setCurrent_profile(m_profile.path); return (current_fps != m_fps); } @@ -859,10 +913,10 @@ void KdenliveDoc::setRenderer(Render *render) { emit progressInfo(QString(), -1); }*/ -void KdenliveDoc::checkProjectClips(bool displayRatioChanged) +void KdenliveDoc::checkProjectClips(bool displayRatioChanged, bool fpsChanged) { if (m_render == NULL) return; - m_clipManager->resetProducersList(m_render->producersList(), displayRatioChanged); + m_clipManager->resetProducersList(m_render->producersList(), displayRatioChanged, fpsChanged); } Render *KdenliveDoc::renderer() @@ -870,7 +924,7 @@ Render *KdenliveDoc::renderer() return m_render; } -void KdenliveDoc::updateClip(const QString id) +void KdenliveDoc::updateClip(const QString &id) { emit updateClipDisplay(id); } @@ -1139,7 +1193,7 @@ void KdenliveDoc::deleteClip(const QString &clipId) emit signalDeleteProjectClip(clipId); } -void KdenliveDoc::slotAddClipList(const KUrl::List urls, const QString group, const QString &groupId) +void KdenliveDoc::slotAddClipList(const KUrl::List urls, const QString &group, const QString &groupId) { m_clipManager->slotAddClipList(urls, group, groupId); //emit selectLastAddedClip(QString::number(m_clipManager->lastClipId())); @@ -1147,7 +1201,7 @@ void KdenliveDoc::slotAddClipList(const KUrl::List urls, const QString group, co } -void KdenliveDoc::slotAddClipFile(const KUrl url, const QString group, const QString &groupId) +void KdenliveDoc::slotAddClipFile(const KUrl &url, const QString &group, const QString &groupId) { m_clipManager->slotAddClipFile(url, group, groupId); emit selectLastAddedClip(QString::number(m_clipManager->lastClipId())); @@ -1178,7 +1232,7 @@ void KdenliveDoc::slotCreateColorClip(const QString &name, const QString &color, emit selectLastAddedClip(QString::number(m_clipManager->lastClipId())); } -void KdenliveDoc::slotCreateSlideshowClipFile(const QString name, const QString path, int count, const QString duration, +void KdenliveDoc::slotCreateSlideshowClipFile(const QString &name, const QString &path, int count, const QString &duration, const bool loop, const bool crop, const bool fade, const QString &luma_duration, const QString &luma_file, const int softness, const QString &animation, QString group, const QString &groupId) @@ -1328,21 +1382,10 @@ void KdenliveDoc::cachePixmap(const QString &fileId, const QPixmap &pix) const pix.save(m_projectFolder.path(KUrl::AddTrailingSlash) + "thumbs/" + fileId + ".png"); } -QString KdenliveDoc::getLadspaFile() const -{ - int ct = 0; - QString counter = QString::number(ct).rightJustified(5, '0', false); - while (QFile::exists(m_projectFolder.path(KUrl::AddTrailingSlash) + "ladspa/" + counter + ".ladspa")) { - ct++; - counter = QString::number(ct).rightJustified(5, '0', false); - } - return m_projectFolder.path(KUrl::AddTrailingSlash) + "ladspa/" + counter + ".ladspa"; -} - bool KdenliveDoc::checkDocumentClips(QDomNodeList infoproducers) { DocumentChecker d(infoproducers, m_document); - return (d.hasMissingClips() == false); + return (d.hasErrorInClips() == false); /* int clipType; QDomElement e; @@ -1411,7 +1454,7 @@ void KdenliveDoc::addTrackEffect(int ix, QDomElement effect) QDomElement e = params.item(i).toElement(); // Check if this effect has a variable parameter - if (e.attribute("default").startsWith('%')) { + if (e.attribute("default").contains('%')) { double evaluatedValue = ProfilesDialog::getStringEval(m_profile, e.attribute("default")); e.setAttribute("default", evaluatedValue); if (e.hasAttribute("value") && e.attribute("value").startsWith('%')) { @@ -1532,7 +1575,9 @@ void KdenliveDoc::updateProjectFolderPlacesEntry() const QString file = KStandardDirs::locateLocal("data", "kfileplaces/bookmarks.xml"); KBookmarkManager *bookmarkManager = KBookmarkManager::managerForFile(file, "kfilePlaces"); + if (!bookmarkManager) return; KBookmarkGroup root = bookmarkManager->root(); + KBookmark bookmark = root.first(); QString kdenliveName = KGlobal::mainComponent().componentName(); @@ -1600,18 +1645,18 @@ double KdenliveDoc::getDisplayRatio(const QString &path) void KdenliveDoc::backupLastSavedVersion(const QString &path) { // Ensure backup folder exists + if (path.isEmpty()) return; QFile file(path); KUrl backupFile = m_projectFolder; backupFile.addPath(".backup/"); KIO::NetAccess::mkdir(backupFile, kapp->activeWindow()); QString fileName = KUrl(path).fileName().section('.', 0, -2); QFileInfo info(file); + fileName.append("-" + m_documentProperties.value("documentid")); fileName.append(info.lastModified().toString("-yyyy-MM-dd-hh-mm")); fileName.append(".kdenlive"); backupFile.addPath(fileName); - emit saveTimelinePreview(backupFile.path() + ".png"); - if (file.exists()) { // delete previous backup if it was done less than 60 seconds ago QFile::remove(backupFile.path()); @@ -1627,6 +1672,7 @@ void KdenliveDoc::cleanupBackupFiles() backupFile.addPath(".backup/"); QDir dir(backupFile.path()); QString projectFile = url().fileName().section('.', 0, -2); + projectFile.append("-" + m_documentProperties.value("documentid")); projectFile.append("-??"); projectFile.append("??"); projectFile.append("-??");