X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fkdenlivedoc.cpp;h=0b0db98315316b0ae0f7accb2293072dab5f555b;hb=e19f8a27245266dcc6c76ecdcea6c1c827f04399;hp=4f098d2e61e232f62cd7dddfbb61325cdc9b4fd1;hpb=13a9ea0bddfc28b81492b3b00008c37b802796f8;p=kdenlive diff --git a/src/kdenlivedoc.cpp b/src/kdenlivedoc.cpp index 4f098d2e..0b0db983 100644 --- a/src/kdenlivedoc.cpp +++ b/src/kdenlivedoc.cpp @@ -17,8 +17,17 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include -#include + +#include "kdenlivedoc.h" +#include "docclipbase.h" +#include "profilesdialog.h" +#include "kdenlivesettings.h" +#include "renderer.h" +#include "clipmanager.h" +#include "titlewidget.h" +#include "mainwindow.h" +#include "documentchecker.h" +#include "kdenlive-config.h" #include #include @@ -29,28 +38,45 @@ #include #include +#include +#include #include -#include "kdenlivedoc.h" -#include "docclipbase.h" -#include "profilesdialog.h" -#include "kdenlivesettings.h" -#include "renderer.h" -#include "clipmanager.h" -#include "titlewidget.h" -#include "mainwindow.h" - -KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup *undoGroup, const QString &profileName, const QPoint tracks, Render *render, MainWindow *parent): QObject(parent), m_render(render), m_url(url), m_projectFolder(projectFolder), m_commandStack(new QUndoStack(undoGroup)), m_modified(false), m_documentLoadingProgress(0), m_documentLoadingStep(0.0), m_startPos(0), m_zoom(7), m_autosave(NULL), m_zoneStart(0), m_zoneEnd(100), m_abortLoading(false) { +KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup *undoGroup, const QString &profileName, const QPoint tracks, Render *render, MainWindow *parent) : + QObject(parent), + m_autosave(NULL), + m_url(url), + m_zoom(7), + m_startPos(0), + m_render(render), + m_commandStack(new QUndoStack(undoGroup)), + m_modified(false), + m_projectFolder(projectFolder), + m_documentLoadingStep(0.0), + m_documentLoadingProgress(0), + m_abortLoading(false), + m_zoneStart(0), + m_zoneEnd(100) +{ m_clipManager = new ClipManager(this); m_autoSaveTimer = new QTimer(this); m_autoSaveTimer->setSingleShot(true); if (!url.isEmpty()) { QString tmpFile; - if (KIO::NetAccess::download(url.path(), tmpFile, parent)) { + bool success = KIO::NetAccess::download(url.path(), tmpFile, parent); + if (success) { QFile file(tmpFile); - m_document.setContent(&file, false); + QString errorMsg; + success = m_document.setContent(&file, false, &errorMsg); file.close(); + if (success == false) { + // File is corrupted, warn user + KMessageBox::error(parent, errorMsg); + } + } else KMessageBox::error(parent, KIO::NetAccess::lastErrorString()); + + if (success) { QDomNode infoXmlNode = m_document.elementsByTagName("kdenlivedoc").at(0); QDomNode westley = m_document.elementsByTagName("westley").at(0); if (!infoXmlNode.isNull()) { @@ -59,7 +85,7 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup // Upgrade old Kdenlive documents to current version if (!convertDocument(version)) { - KMessageBox::sorry(parent, i18n("This project type is unsupported and can't be loaded."), i18n("Unable to open project")); + m_url.clear(); m_document = createEmptyDocument(tracks.x(), tracks.y()); setProfilePath(profileName); } else { @@ -84,10 +110,7 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup } m_startPos = infoXml.attribute("position").toInt(); m_zoom = infoXml.attribute("zoom", "7").toInt(); - - - - + m_zoneStart = infoXml.attribute("zonein", "0").toInt(); m_zoneEnd = infoXml.attribute("zoneout", "100").toInt(); setProfilePath(profilePath); @@ -111,8 +134,7 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup } westley.removeChild(tracksinfo); } - - QDomElement orig; + if (checkDocumentClips() == false) m_abortLoading = true; QDomNodeList producers = m_document.elementsByTagName("producer"); QDomNodeList infoproducers = m_document.elementsByTagName("kdenlive_producer"); const int max = producers.count(); @@ -141,7 +163,7 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup if (!e.isNull() && prodId != "black" && !prodId.startsWith("slowmotion") && !m_abortLoading) { e.setTagName("producer"); // Get MLT's original producer properties - + QDomElement orig; for (int j = 0; j < max; j++) { QDomElement o = producers.item(j).cloneNode().toElement(); QString origId = o.attribute("id").section('_', 0, 0); @@ -190,7 +212,6 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup } KIO::NetAccess::removeTempFile(tmpFile); } else { - KMessageBox::error(parent, KIO::NetAccess::lastErrorString()); parent->slotGotProgressInfo(i18n("File %1 is not a Kdenlive project file."), 100); m_url = KUrl(); m_document = createEmptyDocument(KdenliveSettings::videotracks(), KdenliveSettings::audiotracks()); @@ -216,7 +237,8 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup } -KdenliveDoc::~KdenliveDoc() { +KdenliveDoc::~KdenliveDoc() +{ delete m_commandStack; delete m_clipManager; delete m_autoSaveTimer; @@ -226,12 +248,16 @@ KdenliveDoc::~KdenliveDoc() { } } -void KdenliveDoc::setSceneList() { +void KdenliveDoc::setSceneList() +{ m_render->setSceneList(m_document.toString(), m_startPos); + // m_document xml is now useless, clear it + m_document.clear(); checkProjectClips(); } -QDomDocument KdenliveDoc::createEmptyDocument(const int videotracks, const int audiotracks) { +QDomDocument KdenliveDoc::createEmptyDocument(const int videotracks, const int audiotracks) +{ // Creating new document QDomDocument doc; QDomElement westley = doc.createElement("westley"); @@ -288,7 +314,7 @@ QDomDocument KdenliveDoc::createEmptyDocument(const int videotracks, const int a m_tracksList.append(videoTrack); } - for (uint i = 2; i < total ; i++) { + for (int i = 2; i < total ; i++) { QDomElement transition = doc.createElement("transition"); transition.setAttribute("always_active", "1"); @@ -328,61 +354,85 @@ QDomDocument KdenliveDoc::createEmptyDocument(const int videotracks, const int a } -void KdenliveDoc::syncGuides(QList guides) { - QDomDocument doc; - QDomElement e; +void KdenliveDoc::syncGuides(QList guides) +{ m_guidesXml.clear(); - m_guidesXml = doc.createElement("guides"); + QDomElement guideNode = m_guidesXml.createElement("guides"); + m_guidesXml.appendChild(guideNode); + QDomElement e; for (int i = 0; i < guides.count(); i++) { - e = doc.createElement("guide"); + e = m_guidesXml.createElement("guide"); e.setAttribute("time", guides.at(i)->position().ms() / 1000); e.setAttribute("comment", guides.at(i)->label()); - m_guidesXml.appendChild(e); + guideNode.appendChild(e); } emit guidesUpdated(); } -QDomElement KdenliveDoc::guidesXml() const { - return m_guidesXml; +QDomElement KdenliveDoc::guidesXml() const +{ + return m_guidesXml.documentElement(); } -void KdenliveDoc::slotAutoSave() { +void KdenliveDoc::slotAutoSave() +{ if (m_render && m_autosave) { if (!m_autosave->isOpen() && !m_autosave->open(QIODevice::ReadWrite)) { // show error: could not open the autosave file kDebug() << "ERROR; CANNOT CREATE AUTOSAVE FILE"; } kDebug() << "// AUTOSAVE FILE: " << m_autosave->fileName(); - QDomDocument doc; + QString doc; if (KdenliveSettings::dropbframes()) { KdenliveSettings::setDropbframes(false); m_clipManager->updatePreviewSettings(); - doc.setContent(m_render->sceneList()); + doc = m_render->sceneList(); KdenliveSettings::setDropbframes(true); m_clipManager->updatePreviewSettings(); - } else doc.setContent(m_render->sceneList()); + } else doc = m_render->sceneList(); saveSceneList(m_autosave->fileName(), doc); } } -void KdenliveDoc::setZoom(int factor) { +void KdenliveDoc::setZoom(int factor) +{ m_zoom = factor; } -int KdenliveDoc::zoom() const { +int KdenliveDoc::zoom() const +{ return m_zoom; } -bool KdenliveDoc::convertDocument(double version) { +bool KdenliveDoc::convertDocument(double version) +{ kDebug() << "Opening a document with version " << version; + const double current_version = 0.82; - if (version == 0.82) return true; + if (version == current_version) return true; + + if (version > current_version) { + kDebug() << "Unable to open document with version " << version; + KMessageBox::sorry(kapp->activeWindow(), i18n("This project type is unsupported (version %1) and can't be loaded.\nPlease consider upgrading you Kdenlive version.", version), i18n("Unable to open project")); + return false; + } + + // Opening a old Kdenlive document + if (version == 0.5 || version == 0.7) { + KMessageBox::sorry(kapp->activeWindow(), i18n("This project type is unsupported (version %1) and can't be loaded.", version), i18n("Unable to open project")); + kDebug() << "Unable to open document with version " << version; + // TODO: convert 0.7 (0.5?) files to the new document format. + return false; + } + + setModified(true); if (version == 0.81) { // Add correct tracks info QDomNode kdenlivedoc = m_document.elementsByTagName("kdenlivedoc").at(0); QDomElement infoXml = kdenlivedoc.toElement(); + infoXml.setAttribute("version", current_version); QString currentTrackOrder = infoXml.attribute("tracks"); QDomElement tracksinfo = m_document.createElement("tracksinfo"); for (int i = 0; i < currentTrackOrder.size(); i++) { @@ -399,13 +449,6 @@ bool KdenliveDoc::convertDocument(double version) { return true; } - // Opening a old Kdenlive document - if (version == 0.5 || version == 0.7 || version > 0.81) { - kDebug() << "Unable to open document with version " << version; - // TODO: convert 0.7 (0.5?) files to the new document format. - return FALSE; - } - if (version == 0.8) { // Add the tracks information QDomNodeList tracks = m_document.elementsByTagName("track"); @@ -413,6 +456,7 @@ bool KdenliveDoc::convertDocument(double version) { QDomNode kdenlivedoc = m_document.elementsByTagName("kdenlivedoc").at(0); QDomElement infoXml = kdenlivedoc.toElement(); + infoXml.setAttribute("version", current_version); QDomElement tracksinfo = m_document.createElement("tracksinfo"); for (int i = 0; i < max; i++) { @@ -427,13 +471,15 @@ bool KdenliveDoc::convertDocument(double version) { if (t.attribute("producer") != "black_track") tracksinfo.appendChild(trackinfo); } infoXml.appendChild(tracksinfo); - return TRUE; + return true; } QDomNode westley = m_document.elementsByTagName("westley").at(1); QDomNode tractor = m_document.elementsByTagName("tractor").at(0); QDomNode kdenlivedoc = m_document.elementsByTagName("kdenlivedoc").at(0); QDomElement kdenlivedoc_old = kdenlivedoc.cloneNode(true).toElement(); // Needed for folders + QDomElement infoXml = kdenlivedoc.toElement(); + infoXml.setAttribute("version", current_version); QDomNode multitrack = m_document.elementsByTagName("multitrack").at(0); QDomNodeList playlists = m_document.elementsByTagName("playlist"); @@ -444,62 +490,90 @@ bool KdenliveDoc::convertDocument(double version) { // move playlists outside of tractor and add the tracks instead int max = playlists.count(); - for (int i = 0; i < max; i++) { - QDomNode n = playlists.at(i); - westley.insertBefore(n, QDomNode()); - QDomElement pl = n.toElement(); - QDomElement track = m_document.createElement("track"); - QString trackType = pl.attribute("hide"); - if (!trackType.isEmpty()) - track.setAttribute("hide", trackType); - QString playlist_id = pl.attribute("id"); - if (playlist_id.isEmpty()) { - playlist_id = "black_track"; - pl.setAttribute("id", playlist_id); + if (westley.isNull()) { + westley = m_document.createElement("westley"); + m_document.documentElement().appendChild(westley); + } + if (tractor.isNull()) { + kDebug() << "// NO WESTLEY PLAYLIST, building empty one"; + QDomElement blank_tractor = m_document.createElement("tractor"); + westley.appendChild(blank_tractor); + QDomElement blank_playlist = m_document.createElement("playlist"); + blank_playlist.setAttribute("id", "black_track"); + westley.insertBefore(blank_playlist, QDomNode()); + QDomElement blank_track = m_document.createElement("track"); + blank_track.setAttribute("producer", "black_track"); + blank_tractor.appendChild(blank_track); + + QDomNodeList kdenlivetracks = m_document.elementsByTagName("kdenlivetrack"); + for (int i = 0; i < kdenlivetracks.count(); i++) { + blank_playlist = m_document.createElement("playlist"); + blank_playlist.setAttribute("id", "playlist" + QString::number(i)); + westley.insertBefore(blank_playlist, QDomNode()); + blank_track = m_document.createElement("track"); + blank_track.setAttribute("producer", "playlist" + QString::number(i)); + blank_tractor.appendChild(blank_track); + if (kdenlivetracks.at(i).toElement().attribute("cliptype") == "Sound") { + blank_playlist.setAttribute("hide", "video"); + blank_track.setAttribute("hide", "video"); + } } - track.setAttribute("producer", playlist_id); - //tractor.appendChild(track); + } else for (int i = 0; i < max; i++) { + QDomNode n = playlists.at(i); + westley.insertBefore(n, QDomNode()); + QDomElement pl = n.toElement(); + QDomElement track = m_document.createElement("track"); + QString trackType = pl.attribute("hide"); + if (!trackType.isEmpty()) + track.setAttribute("hide", trackType); + QString playlist_id = pl.attribute("id"); + if (playlist_id.isEmpty()) { + playlist_id = "black_track"; + pl.setAttribute("id", playlist_id); + } + track.setAttribute("producer", playlist_id); + //tractor.appendChild(track); #define KEEP_TRACK_ORDER 1 #ifdef KEEP_TRACK_ORDER - tractor.insertAfter(track, QDomNode()); + tractor.insertAfter(track, QDomNode()); #else - // Insert the new track in an order that hopefully matches the 3 video, then 2 audio tracks of Kdenlive 0.7.0 - // insertion sort - O( tracks*tracks ) - // Note, this breaks _all_ transitions - but you can move them up and down afterwards. - QDomElement tractor_elem = tractor.toElement(); - if (! tractor_elem.isNull()) { - QDomNodeList tracks = tractor_elem.elementsByTagName("track"); - int size = tracks.size(); - if (size == 0) { - tractor.insertAfter(track, QDomNode()); - } else { - bool inserted = false; - for (int i = 0; i < size; ++i) { - QDomElement track_elem = tracks.at(i).toElement(); - if (track_elem.isNull()) { - tractor.insertAfter(track, QDomNode()); - inserted = true; - break; - } else { - kDebug() << "playlist_id: " << playlist_id << " producer:" << track_elem.attribute("producer"); - if (playlist_id < track_elem.attribute("producer")) { - tractor.insertBefore(track, track_elem); + // Insert the new track in an order that hopefully matches the 3 video, then 2 audio tracks of Kdenlive 0.7.0 + // insertion sort - O( tracks*tracks ) + // Note, this breaks _all_ transitions - but you can move them up and down afterwards. + QDomElement tractor_elem = tractor.toElement(); + if (! tractor_elem.isNull()) { + QDomNodeList tracks = tractor_elem.elementsByTagName("track"); + int size = tracks.size(); + if (size == 0) { + tractor.insertAfter(track, QDomNode()); + } else { + bool inserted = false; + for (int i = 0; i < size; ++i) { + QDomElement track_elem = tracks.at(i).toElement(); + if (track_elem.isNull()) { + tractor.insertAfter(track, QDomNode()); inserted = true; break; + } else { + kDebug() << "playlist_id: " << playlist_id << " producer:" << track_elem.attribute("producer"); + if (playlist_id < track_elem.attribute("producer")) { + tractor.insertBefore(track, track_elem); + inserted = true; + break; + } } } + // Reach here, no insertion, insert last + if (!inserted) { + tractor.insertAfter(track, QDomNode()); + } } - // Reach here, no insertion, insert last - if (!inserted) { - tractor.insertAfter(track, QDomNode()); - } + } else { + kWarning() << "tractor was not a QDomElement"; + tractor.insertAfter(track, QDomNode()); } - } else { - kWarning() << "tractor was not a QDomElement"; - tractor.insertAfter(track, QDomNode()); - } #endif - } + } tractor.removeChild(multitrack); // audio track mixing transitions should not be added to track view, so add required attribute @@ -513,10 +587,15 @@ bool KdenliveDoc::convertDocument(double version) { QDomText value = m_document.createTextNode("237"); property.appendChild(value); tr.appendChild(property); + property = m_document.createElement("property"); + property.setAttribute("name", "mlt_service"); + value = m_document.createTextNode("mix"); + property.appendChild(value); + tr.appendChild(property); } else { // convert transition QDomNamedNodeMap attrs = tr.attributes(); - for (unsigned int j = 0; j < attrs.count(); j++) { + for (int j = 0; j < attrs.count(); j++) { QString attrName = attrs.item(j).nodeName(); if (attrName != "in" && attrName != "out" && attrName != "id") { QDomElement property = m_document.createElement("property"); @@ -624,13 +703,13 @@ bool KdenliveDoc::convertDocument(double version) { QDomElement prod = producers.at(0).toElement(); // add resource also as a property (to allow path correction in setNewResource()) // TODO: will it work with slowmotion? needs testing - if (!prod.attribute("resource").isEmpty()) { + /*if (!prod.attribute("resource").isEmpty()) { QDomElement prop_resource = m_document.createElement("property"); prop_resource.setAttribute("name", "resource"); QDomText resource = m_document.createTextNode(prod.attribute("resource")); prop_resource.appendChild(resource); prod.appendChild(prop_resource); - } + }*/ QDomNode m = prod.firstChild(); if (!m.isNull()) { if (m.toElement().tagName() == "markers") { @@ -765,37 +844,38 @@ bool KdenliveDoc::convertDocument(double version) { QDomElement wproducer = wproducers.at(i).toElement(); if (wproducer.isNull()) { kWarning() << "Found producer in westley0, that was not a QDomElement"; + continue; + } + if (wproducer.attribute("id") == "black") continue; + // We have to do slightly different things, depending on the type + kDebug() << "Converting producer element with type" << wproducer.attribute("type"); + if (wproducer.attribute("type").toInt() == TEXT) { + kDebug() << "Found TEXT element in producer" << endl; + QDomElement kproducer = wproducer.cloneNode(true).toElement(); + kproducer.setTagName("kdenlive_producer"); + kdenlivedoc_new.appendChild(kproducer); + // TODO: Perhaps needs some more changes here to "frequency", aspect ratio as a float, frame_size, channels, and later, ressource and title name } else { - // We have to do slightly different things, depending on the type - kDebug() << "Converting producer element with type" << wproducer.attribute("type"); - if (wproducer.attribute("type").toInt() == TEXT) { - kDebug() << "Found TEXT element in producer" << endl; - QDomElement kproducer = wproducer.cloneNode(true).toElement(); - kproducer.setTagName("kdenlive_producer"); - kdenlivedoc_new.appendChild(kproducer); - // TODO: Perhaps needs some more changes here to "frequency", aspect ratio as a float, frame_size, channels, and later, ressource and title name - } else { - QDomElement kproducer = m_document.createElement("kdenlive_producer"); - kproducer.setAttribute("id", wproducer.attribute("id")); - if (!wproducer.attribute("description").isEmpty()) - kproducer.setAttribute("description", wproducer.attribute("description")); - kproducer.setAttribute("resource", wproducer.attribute("resource")); - kproducer.setAttribute("type", wproducer.attribute("type")); - // Testing fix for 358 - if (!wproducer.attribute("aspect_ratio").isEmpty()) { - kproducer.setAttribute("aspect_ratio", wproducer.attribute("aspect_ratio")); - } - if (!wproducer.attribute("source_fps").isEmpty()) { - kproducer.setAttribute("fps", wproducer.attribute("source_fps")); - } - if (!wproducer.attribute("length").isEmpty()) { - kproducer.setAttribute("duration", wproducer.attribute("length")); - } - kdenlivedoc_new.appendChild(kproducer); + QDomElement kproducer = m_document.createElement("kdenlive_producer"); + kproducer.setAttribute("id", wproducer.attribute("id")); + if (!wproducer.attribute("description").isEmpty()) + kproducer.setAttribute("description", wproducer.attribute("description")); + kproducer.setAttribute("resource", wproducer.attribute("resource")); + kproducer.setAttribute("type", wproducer.attribute("type")); + // Testing fix for 358 + if (!wproducer.attribute("aspect_ratio").isEmpty()) { + kproducer.setAttribute("aspect_ratio", wproducer.attribute("aspect_ratio")); + } + if (!wproducer.attribute("source_fps").isEmpty()) { + kproducer.setAttribute("fps", wproducer.attribute("source_fps")); } - if (wproducer.attribute("id").toInt() > max_kproducer_id) { - max_kproducer_id = wproducer.attribute("id").toInt(); + if (!wproducer.attribute("length").isEmpty()) { + kproducer.setAttribute("duration", wproducer.attribute("length")); } + kdenlivedoc_new.appendChild(kproducer); + } + if (wproducer.attribute("id").toInt() > max_kproducer_id) { + max_kproducer_id = wproducer.attribute("id").toInt(); } } } @@ -858,7 +938,7 @@ bool KdenliveDoc::convertDocument(double version) { kDebug() << "found" << avfiles.count() << "s and" << kproducers.count() << "s"; for (int i = 0; i < avfiles.count(); ++i) { QDomElement avfile = avfiles.at(i).toElement(); - QDomElement kproducer = QDomElement(); + QDomElement kproducer; if (avfile.isNull()) kWarning() << "found an that is not a QDomElement"; else { @@ -877,7 +957,7 @@ bool KdenliveDoc::convertDocument(double version) { //kDebug() << "ready to set additional 's attributes (id =" << id << ")"; kproducer.setAttribute("channels", avfile.attribute("channels")); kproducer.setAttribute("duration", avfile.attribute("duration")); - kproducer.setAttribute("frame_size", avfile.attribute("width") + "x" + avfile.attribute("height")); + kproducer.setAttribute("frame_size", avfile.attribute("width") + 'x' + avfile.attribute("height")); kproducer.setAttribute("frequency", avfile.attribute("frequency")); if (kproducer.attribute("description").isEmpty() && !avfile.attribute("description").isEmpty()) kproducer.setAttribute("description", avfile.attribute("description")); @@ -885,44 +965,53 @@ bool KdenliveDoc::convertDocument(double version) { } } - //kDebug() << "///////////////// CONVERTED DOC:"; - //kDebug() << m_document.toString(); - /* - QFile file( "converted.kdenlive" ); - if ( file.open( QIODevice::WriteOnly ) ) { - QTextStream stream( &file ); - stream << m_document.toString(); - file.close(); + /*kDebug() << "///////////////// CONVERTED DOC:"; + kDebug() << m_document.toString(); + kDebug() << "///////////////// END CONVERTED DOC:"; + + QFile file("converted.kdenlive"); + if (file.open(QIODevice::WriteOnly)) { + QTextStream stream(&file); + stream << m_document.toString().toUtf8(); + file.close(); } else { - kDebug() << "Unable to dump file to converted.kdenlive"; - } - */ + kDebug() << "Unable to dump file to converted.kdenlive"; + }*/ + //kDebug() << "///////////////// END CONVERTED DOC:"; - return TRUE; + return true; } -QString KdenliveDoc::colorToString(const QColor& c) { +QString KdenliveDoc::colorToString(const QColor& c) +{ QString ret = "%1,%2,%3,%4"; ret = ret.arg(c.red()).arg(c.green()).arg(c.blue()).arg(c.alpha()); return ret; } -void KdenliveDoc::setZone(int start, int end) { +void KdenliveDoc::setZone(int start, int end) +{ m_zoneStart = start; m_zoneEnd = end; } -QPoint KdenliveDoc::zone() const { +QPoint KdenliveDoc::zone() const +{ return QPoint(m_zoneStart, m_zoneEnd); } -bool KdenliveDoc::saveSceneList(const QString &path, QDomDocument sceneList) { +bool KdenliveDoc::saveSceneList(const QString &path, const QString &scene) +{ + QDomDocument sceneList; + sceneList.setContent(scene, true); QDomNode wes = sceneList.elementsByTagName("westley").at(0); - QDomElement addedXml = sceneList.createElement("kdenlivedoc"); + wes.appendChild(addedXml); + QDomElement markers = sceneList.createElement("markers"); addedXml.setAttribute("version", "0.82"); + addedXml.setAttribute("kdenliveversion", VERSION); addedXml.setAttribute("profile", profilePath()); addedXml.setAttribute("position", m_render->seekPosition().frames(m_fps)); addedXml.setAttribute("zonein", m_zoneStart); @@ -971,9 +1060,13 @@ bool KdenliveDoc::saveSceneList(const QString &path, QDomDocument sceneList) { } } addedXml.appendChild(markers); - if (!m_guidesXml.isNull()) addedXml.appendChild(sceneList.importNode(m_guidesXml, true)); - wes.appendChild(addedXml); + // Add guides + if (!m_guidesXml.isNull()) addedXml.appendChild(sceneList.importNode(m_guidesXml.documentElement(), true)); + + // Add clip groups + addedXml.appendChild(sceneList.importNode(m_clipManager->groupsXml(), true)); + //wes.appendChild(doc.importNode(kdenliveData, true)); QFile file(path); @@ -982,22 +1075,30 @@ bool KdenliveDoc::saveSceneList(const QString &path, QDomDocument sceneList) { KMessageBox::error(kapp->activeWindow(), i18n("Cannot write to file %1", path)); return false; } - QTextStream out(&file); - out << sceneList.toString(); + + file.write(sceneList.toString().toUtf8()); + if (file.error() != QFile::NoError) { + KMessageBox::error(kapp->activeWindow(), i18n("Cannot write to file %1", path)); + file.close(); + return false; + } file.close(); return true; } -ClipManager *KdenliveDoc::clipManager() { +ClipManager *KdenliveDoc::clipManager() +{ return m_clipManager; } -KUrl KdenliveDoc::projectFolder() const { +KUrl KdenliveDoc::projectFolder() const +{ //if (m_projectFolder.isEmpty()) return KUrl(KStandardDirs::locateLocal("appdata", "/projects/")); return m_projectFolder; } -void KdenliveDoc::setProjectFolder(KUrl url) { +void KdenliveDoc::setProjectFolder(KUrl url) +{ if (url == m_projectFolder) return; setModified(true); KStandardDirs::makeDir(url.path()); @@ -1007,7 +1108,8 @@ void KdenliveDoc::setProjectFolder(KUrl url) { m_projectFolder = url; } -void KdenliveDoc::moveProjectData(KUrl url) { +void KdenliveDoc::moveProjectData(KUrl url) +{ QList list = m_clipManager->documentClipList(); //TODO: Also move ladspa effects files for (int i = 0; i < list.count(); i++) { @@ -1035,20 +1137,24 @@ void KdenliveDoc::moveProjectData(KUrl url) { } } -QString KdenliveDoc::profilePath() const { +const QString &KdenliveDoc::profilePath() const +{ return m_profile.path; } -MltVideoProfile KdenliveDoc::mltProfile() const { +MltVideoProfile KdenliveDoc::mltProfile() const +{ return m_profile; } -void KdenliveDoc::setProfilePath(QString path) { +void KdenliveDoc::setProfilePath(QString path) +{ if (path.isEmpty()) path = KdenliveSettings::default_profile(); if (path.isEmpty()) path = "dv_pal"; m_profile = ProfilesDialog::getVideoProfile(path); KdenliveSettings::setProject_display_ratio((double) m_profile.display_aspect_num / m_profile.display_aspect_den); m_fps = (double) m_profile.frame_rate_num / m_profile.frame_rate_den; + KdenliveSettings::setProject_fps(m_fps); m_width = m_profile.width; m_height = m_profile.height; kDebug() << "KDEnnlive document, init timecode from path: " << path << ", " << m_fps; @@ -1056,20 +1162,24 @@ void KdenliveDoc::setProfilePath(QString path) { else m_timecode.setFormat((int) m_fps); } -const double KdenliveDoc::dar() { +double KdenliveDoc::dar() +{ return (double) m_profile.display_aspect_num / m_profile.display_aspect_den; } -void KdenliveDoc::setThumbsProgress(const QString &message, int progress) { +void KdenliveDoc::setThumbsProgress(const QString &message, int progress) +{ emit progressInfo(message, progress); } -void KdenliveDoc::loadingProgressed() { +void KdenliveDoc::loadingProgressed() +{ m_documentLoadingProgress += m_documentLoadingStep; emit progressInfo(QString(), (int) m_documentLoadingProgress); } -QUndoStack *KdenliveDoc::commandStack() { +QUndoStack *KdenliveDoc::commandStack() +{ return m_commandStack; } @@ -1087,8 +1197,14 @@ void KdenliveDoc::setRenderer(Render *render) { emit progressInfo(QString(), -1); }*/ -void KdenliveDoc::checkProjectClips() { +void KdenliveDoc::checkProjectClips() +{ + kDebug() << "+++++++++++++ + + + + CHK PCLIPS"; if (m_render == NULL) return; + m_clipManager->resetProducersList(m_render->producersList()); + return; + + // Useless now... QList prods = m_render->producersList(); QString id ; QString prodId ; @@ -1101,20 +1217,20 @@ void KdenliveDoc::checkProjectClips() { if (clip) clip->setProducer(prods.at(i)); if (clip && clip->clipType() == TEXT && !QFile::exists(clip->fileURL().path())) { // regenerate text clip image if required - kDebug() << "// TITLE: " << clip->getProperty("titlename") << " Preview file: " << clip->getProperty("resource") << " DOES NOT EXIST"; - QString titlename = clip->getProperty("titlename"); + //kDebug() << "// TITLE: " << clip->getProperty("titlename") << " Preview file: " << clip->getProperty("resource") << " DOES NOT EXIST"; + QString titlename = clip->getProperty("name"); QString titleresource; if (titlename.isEmpty()) { QStringList titleInfo = TitleWidget::getFreeTitleInfo(projectFolder()); titlename = titleInfo.at(0); titleresource = titleInfo.at(1); - clip->setProperty("titlename", titlename); + clip->setProperty("name", titlename); kDebug() << "// New title set to: " << titlename; } else { - titleresource = TitleWidget::getTitleResourceFromName(projectFolder(), titlename); + titleresource = TitleWidget::getFreeTitleInfo(projectFolder()).at(1); + //titleresource = TitleWidget::getTitleResourceFromName(projectFolder(), titlename); } - QString titlepath = projectFolder().path() + "/titles/"; - TitleWidget *dia_ui = new TitleWidget(KUrl(), titlepath, m_render, kapp->activeWindow()); + TitleWidget *dia_ui = new TitleWidget(KUrl(), KUrl(titleresource).directory(), m_render, kapp->activeWindow()); QDomDocument doc; doc.setContent(clip->getProperty("xmldata")); dia_ui->setXml(doc); @@ -1127,26 +1243,31 @@ void KdenliveDoc::checkProjectClips() { } } -void KdenliveDoc::updatePreviewSettings() { +void KdenliveDoc::updatePreviewSettings() +{ m_clipManager->updatePreviewSettings(); m_render->updatePreviewSettings(); m_clipManager->resetProducersList(m_render->producersList()); } -Render *KdenliveDoc::renderer() { +Render *KdenliveDoc::renderer() +{ return m_render; } -void KdenliveDoc::updateClip(const QString &id) { +void KdenliveDoc::updateClip(const QString &id) +{ emit updateClipDisplay(id); } -int KdenliveDoc::getFramePos(QString duration) { +int KdenliveDoc::getFramePos(QString duration) +{ return m_timecode.getFrameCount(duration, m_fps); } -QString KdenliveDoc::producerName(const QString &id) { +QString KdenliveDoc::producerName(const QString &id) +{ QString result = "unnamed"; QDomNodeList prods = producersList(); int ct = prods.count(); @@ -1161,77 +1282,56 @@ QString KdenliveDoc::producerName(const QString &id) { return result; } -void KdenliveDoc::setProducerDuration(const QString &id, int duration) { - QDomNodeList prods = producersList(); - int ct = prods.count(); - for (int i = 0; i < ct ; i++) { - QDomElement e = prods.item(i).toElement(); - if (e.attribute("id") != "black" && e.attribute("id") == id) { - e.setAttribute("duration", QString::number(duration)); - break; - } - } -} - -int KdenliveDoc::getProducerDuration(const QString &id) { - int result = 0; - QDomNodeList prods = producersList(); - int ct = prods.count(); - for (int i = 0; i < ct ; i++) { - QDomElement e = prods.item(i).toElement(); - if (e.attribute("id") != "black" && e.attribute("id") == id) { - result = e.attribute("duration").toInt(); - break; - } - } - return result; -} - - -QDomDocument KdenliveDoc::generateSceneList() { - QDomDocument doc; - QDomElement westley = doc.createElement("westley"); - doc.appendChild(westley); - QDomElement prod = doc.createElement("producer"); -} - -QDomDocument KdenliveDoc::toXml() { +QDomDocument KdenliveDoc::toXml() +{ return m_document; } -Timecode KdenliveDoc::timecode() const { +Timecode KdenliveDoc::timecode() const +{ return m_timecode; } -QDomNodeList KdenliveDoc::producersList() { +QDomNodeList KdenliveDoc::producersList() +{ return m_document.elementsByTagName("producer"); } -double KdenliveDoc::projectDuration() const { - if (m_render) return GenTime(m_render->getLength(), m_fps).ms() / 1000; +double KdenliveDoc::projectDuration() const +{ + if (m_render) + return GenTime(m_render->getLength(), m_fps).ms() / 1000; + else + return 0; } -double KdenliveDoc::fps() const { +double KdenliveDoc::fps() const +{ return m_fps; } -int KdenliveDoc::width() const { +int KdenliveDoc::width() const +{ return m_width; } -int KdenliveDoc::height() const { +int KdenliveDoc::height() const +{ return m_height; } -KUrl KdenliveDoc::url() const { +KUrl KdenliveDoc::url() const +{ return m_url; } -void KdenliveDoc::setUrl(KUrl url) { +void KdenliveDoc::setUrl(KUrl url) +{ m_url = url; } -void KdenliveDoc::setModified(bool mod) { +void KdenliveDoc::setModified(bool mod) +{ if (!m_url.isEmpty() && mod && KdenliveSettings::crashrecovery()) { m_autoSaveTimer->start(3000); } @@ -1240,56 +1340,57 @@ void KdenliveDoc::setModified(bool mod) { emit docModified(m_modified); } -bool KdenliveDoc::isModified() const { +bool KdenliveDoc::isModified() const +{ return m_modified; } -QString KdenliveDoc::description() const { +const QString KdenliveDoc::description() const +{ if (m_url.isEmpty()) return i18n("Untitled") + " / " + m_profile.description; else return m_url.fileName() + " / " + m_profile.description; } -void KdenliveDoc::addClip(QDomElement elem, QString clipId, bool createClipItem) { +void KdenliveDoc::addClip(QDomElement elem, QString clipId, bool createClipItem) +{ const QString producerId = clipId.section('_', 0, 0); - int subtrack = clipId.section('_', 1, 1).toInt(); DocClipBase *clip = m_clipManager->getClipById(producerId); + if (clip == NULL) { - /*kDebug()<<"// CLIP "<activeWindow()); + TitleWidget *dia_ui = new TitleWidget(KUrl(), KUrl(titleresource).directory(), m_render, kapp->activeWindow()); QDomDocument doc; doc.setContent(elem.attribute("xmldata")); dia_ui->setXml(doc); QImage pix = dia_ui->renderedPixmap(); pix.save(titleresource); elem.setAttribute("resource", titleresource); + setNewClipResource(clipId, titleresource); delete dia_ui; - } else if (!path.isEmpty() && !QFile::exists(path) && elem.attribute("type").toInt() != TEXT) { + } + + if (path.isEmpty() == false && QFile::exists(path) == false && elem.attribute("type").toInt() != TEXT && !elem.hasAttribute("placeholder")) { kDebug() << "// FOUND MISSING CLIP: " << path << ", TYPE: " << elem.attribute("type").toInt(); const QString size = elem.attribute("file_size"); const QString hash = elem.attribute("file_hash"); @@ -1303,17 +1404,17 @@ void KdenliveDoc::addClip(QDomElement elem, QString clipId, bool createClipItem) int res = KMessageBox::questionYesNoCancel(kapp->activeWindow(), i18n("Clip %1
is invalid or missing, what do you want to do?", path), i18n("File not found"), KGuiItem(i18n("Search manually")), KGuiItem(i18n("Keep as placeholder"))); if (res == KMessageBox::Yes) newpath = KFileDialog::getExistingDirectory(KUrl("kfiledialog:///clipfolder"), kapp->activeWindow(), i18n("Looking for %1", path)); - else if (res == KMessageBox::Cancel) { + else { // Abort project loading - action = KMessageBox::Cancel; + action = res; } } else { int res = KMessageBox::questionYesNoCancel(kapp->activeWindow(), i18n("Clip %1
is invalid or missing, what do you want to do?", path), i18n("File not found"), KGuiItem(i18n("Search manually")), KGuiItem(i18n("Keep as placeholder"))); if (res == KMessageBox::Yes) newpath = KFileDialog::getOpenFileName(KUrl("kfiledialog:///clipfolder"), QString(), kapp->activeWindow(), i18n("Looking for %1", path)); - else if (res == KMessageBox::Cancel) { + else { // Abort project loading - action = KMessageBox::Cancel; + action = res; } } } @@ -1326,6 +1427,9 @@ void KdenliveDoc::addClip(QDomElement elem, QString clipId, bool createClipItem) } else if (action == KMessageBox::Cancel) { m_abortLoading = true; return; + } else if (action == KMessageBox::No) { + // Keep clip as placeHolder + elem.setAttribute("placeholder", '1'); } if (!newpath.isEmpty()) { if (elem.attribute("type").toInt() == SLIDESHOW) newpath.append('/' + extension); @@ -1337,6 +1441,7 @@ void KdenliveDoc::addClip(QDomElement elem, QString clipId, bool createClipItem) clip = new DocClipBase(m_clipManager, elem, producerId); m_clipManager->addClip(clip); } + if (createClipItem) { emit addProjectClip(clip); qApp->processEvents(); @@ -1345,13 +1450,14 @@ void KdenliveDoc::addClip(QDomElement elem, QString clipId, bool createClipItem) } -void KdenliveDoc::setNewClipResource(const QString &id, const QString &path) { +void KdenliveDoc::setNewClipResource(const QString &id, const QString &path) +{ QDomNodeList prods = m_document.elementsByTagName("producer"); int maxprod = prods.count(); for (int i = 0; i < maxprod; i++) { QDomNode m = prods.at(i); QString prodId = m.toElement().attribute("id"); - if (prodId == id || prodId.startsWith(id + "_")) { + if (prodId == id || prodId.startsWith(id + '_')) { QDomNodeList params = m.childNodes(); for (int j = 0; j < params.count(); j++) { QDomElement e = params.item(j).toElement(); @@ -1364,7 +1470,8 @@ void KdenliveDoc::setNewClipResource(const QString &id, const QString &path) { } } -QString KdenliveDoc::searchFileRecursively(const QDir &dir, const QString &matchSize, const QString &matchHash) const { +QString KdenliveDoc::searchFileRecursively(const QDir &dir, const QString &matchSize, const QString &matchHash) const +{ QString foundFileName; QByteArray fileData; QByteArray fileHash; @@ -1400,7 +1507,8 @@ QString KdenliveDoc::searchFileRecursively(const QDir &dir, const QString &match return foundFileName; } -void KdenliveDoc::addClipInfo(QDomElement elem, QDomElement orig, QString clipId) { +void KdenliveDoc::addClipInfo(QDomElement elem, QDomElement orig, QString clipId) +{ DocClipBase *clip = m_clipManager->getClipById(clipId); if (clip == NULL) { addClip(elem, clipId, false); @@ -1408,7 +1516,7 @@ void KdenliveDoc::addClipInfo(QDomElement elem, QDomElement orig, QString clipId QMap properties; QDomNamedNodeMap attributes = elem.attributes(); QString attrname; - for (unsigned int i = 0; i < attributes.count(); i++) { + for (int i = 0; i < attributes.count(); i++) { attrname = attributes.item(i).nodeName(); if (attrname != "resource") properties.insert(attrname, attributes.item(i).nodeValue()); @@ -1428,13 +1536,14 @@ void KdenliveDoc::addClipInfo(QDomElement elem, QDomElement orig, QString clipId m = m.nextSibling(); } if (!meta.isEmpty()) { - clip = m_clipManager->getClipById(clipId); + if (clip == NULL) clip = m_clipManager->getClipById(clipId); if (clip) clip->setMetadata(meta); } } } -void KdenliveDoc::deleteProjectClip(QList ids) { +void KdenliveDoc::deleteProjectClip(QList ids) +{ for (int i = 0; i < ids.size(); ++i) { emit deleteTimelineClip(ids.at(i)); m_clipManager->slotDeleteClip(ids.at(i)); @@ -1442,44 +1551,40 @@ void KdenliveDoc::deleteProjectClip(QList ids) { setModified(true); } -void KdenliveDoc::deleteClip(const QString &clipId) { +void KdenliveDoc::deleteClip(const QString &clipId) +{ emit signalDeleteProjectClip(clipId); m_clipManager->deleteClip(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())); setModified(true); } -void KdenliveDoc::slotAddClipFile(const KUrl url, const QString group, const QString &groupId) { - kDebug() << "///////// DOCUM, ADD CLP: " << url; +void KdenliveDoc::slotAddClipFile(const KUrl url, const QString group, const QString &groupId) +{ + //kDebug() << "///////// DOCUM, ADD CLP: " << url; m_clipManager->slotAddClipFile(url, group, groupId); emit selectLastAddedClip(QString::number(m_clipManager->lastClipId())); setModified(true); } -const QString&KdenliveDoc::getFreeClipId() { +const QString KdenliveDoc::getFreeClipId() +{ return QString::number(m_clipManager->getFreeClipId()); } -DocClipBase *KdenliveDoc::getBaseClip(const QString &clipId) { +DocClipBase *KdenliveDoc::getBaseClip(const QString &clipId) +{ return m_clipManager->getClipById(clipId); } -void KdenliveDoc::slotAddColorClipFile(const QString name, const QString color, QString duration, const QString group, const QString &groupId) { - m_clipManager->slotAddColorClipFile(name, color, duration, group, groupId); - setModified(true); -} - -void KdenliveDoc::slotAddSlideshowClipFile(const QString name, const QString path, int count, const QString duration, const bool loop, const bool fade, const QString &luma_duration, const QString &luma_file, const int softness, const QString group, const QString &groupId) { - m_clipManager->slotAddSlideshowClipFile(name, path, count, duration, loop, fade, luma_duration, luma_file, softness, group, groupId); - setModified(true); -} - -void KdenliveDoc::slotCreateTextClip(QString group, const QString &groupId) { +void KdenliveDoc::slotCreateTextClip(QString /*group*/, const QString &/*groupId*/) +{ QString titlesFolder = projectFolder().path() + "/titles/"; KStandardDirs::makeDir(titlesFolder); TitleWidget *dia_ui = new TitleWidget(KUrl(), titlesFolder, m_render, kapp->activeWindow()); @@ -1494,51 +1599,62 @@ void KdenliveDoc::slotCreateTextClip(QString group, const QString &groupId) { delete dia_ui; } -int KdenliveDoc::tracksCount() const { +int KdenliveDoc::tracksCount() const +{ return m_tracksList.count(); } -TrackInfo KdenliveDoc::trackInfoAt(int ix) const { +TrackInfo KdenliveDoc::trackInfoAt(int ix) const +{ return m_tracksList.at(ix); } -void KdenliveDoc::switchTrackAudio(int ix, bool hide) { +void KdenliveDoc::switchTrackAudio(int ix, bool hide) +{ m_tracksList[ix].isMute = hide; // !m_tracksList.at(ix).isMute; } -void KdenliveDoc::switchTrackLock(int ix, bool lock) { +void KdenliveDoc::switchTrackLock(int ix, bool lock) +{ m_tracksList[ix].isLocked = lock; } -bool KdenliveDoc::isTrackLocked(int ix) const { - return m_tracksList[ix].isLocked; +bool KdenliveDoc::isTrackLocked(int ix) const +{ + return m_tracksList.at(ix).isLocked; } -void KdenliveDoc::switchTrackVideo(int ix, bool hide) { +void KdenliveDoc::switchTrackVideo(int ix, bool hide) +{ m_tracksList[ix].isBlind = hide; // !m_tracksList.at(ix).isBlind; } -void KdenliveDoc::insertTrack(int ix, TrackInfo type) { +void KdenliveDoc::insertTrack(int ix, TrackInfo type) +{ if (ix == -1) m_tracksList << type; else m_tracksList.insert(ix, type); } -void KdenliveDoc::deleteTrack(int ix) { +void KdenliveDoc::deleteTrack(int ix) +{ m_tracksList.removeAt(ix); } -void KdenliveDoc::setTrackType(int ix, TrackInfo type) { +void KdenliveDoc::setTrackType(int ix, TrackInfo type) +{ m_tracksList[ix].type = type.type; m_tracksList[ix].isMute = type.isMute; m_tracksList[ix].isBlind = type.isBlind; m_tracksList[ix].isLocked = type.isLocked; } -const QList KdenliveDoc::tracksList() const { +const QList KdenliveDoc::tracksList() const +{ return m_tracksList; } -QPoint KdenliveDoc::getTracksCount() const { +QPoint KdenliveDoc::getTracksCount() const +{ int audio = 0; int video = 0; foreach(const TrackInfo &info, m_tracksList) { @@ -1548,11 +1664,13 @@ QPoint KdenliveDoc::getTracksCount() const { return QPoint(video, audio); } -void KdenliveDoc::cachePixmap(const QString &fileId, const QPixmap &pix) const { +void KdenliveDoc::cachePixmap(const QString &fileId, const QPixmap &pix) const +{ pix.save(m_projectFolder.path() + "/thumbs/" + fileId + ".png"); } -QString KdenliveDoc::getLadspaFile() const { +QString KdenliveDoc::getLadspaFile() const +{ int ct = 0; QString counter = QString::number(ct).rightJustified(5, '0', false); while (QFile::exists(m_projectFolder.path() + "/ladspa/" + counter + ".ladspa")) { @@ -1562,5 +1680,12 @@ QString KdenliveDoc::getLadspaFile() const { return m_projectFolder.path() + "/ladspa/" + counter + ".ladspa"; } +bool KdenliveDoc::checkDocumentClips() +{ + DocumentChecker d(m_document); + return (d.exec() == QDialog::Accepted); +} + + #include "kdenlivedoc.moc"