X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fkdenlivedoc.cpp;h=624a3e93acf082f138b0e39e835d503c9d72826c;hb=f5584dd222f8bda079f31c903b2b59ce82747ed9;hp=692500194c6bd1ca6483ca54de41285912634574;hpb=168b0f89b86996f312e60dda73e2795a54a3c899;p=kdenlive diff --git a/src/kdenlivedoc.cpp b/src/kdenlivedoc.cpp index 69250019..624a3e93 100644 --- a/src/kdenlivedoc.cpp +++ b/src/kdenlivedoc.cpp @@ -23,7 +23,7 @@ #include #include #include - +#include #include "kdenlivedoc.h" #include "docclipbase.h" @@ -34,8 +34,9 @@ #include "addfoldercommand.h" #include "editfoldercommand.h" #include "titlewidget.h" +#include "mainwindow.h" -KdenliveDoc::KdenliveDoc(const KUrl &url, MltVideoProfile profile, QUndoGroup *undoGroup, QWidget *parent): QObject(parent), m_render(NULL), m_url(url), m_profile(profile), m_fps((double)profile.frame_rate_num / profile.frame_rate_den), m_width(profile.width), m_height(profile.height), m_commandStack(new KUndoStack(undoGroup)), m_modified(false) { +KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, MltVideoProfile profile, QUndoGroup *undoGroup, MainWindow *parent): QObject(parent), m_render(NULL), m_url(url), m_projectFolder(projectFolder), m_profile(profile), m_fps((double)profile.frame_rate_num / profile.frame_rate_den), m_width(profile.width), m_height(profile.height), m_commandStack(new KUndoStack(undoGroup)), m_modified(false), m_documentLoadingProgress(0), m_documentLoadingStep(0.0), m_startPos(0) { m_clipManager = new ClipManager(this); if (!url.isEmpty()) { QString tmpFile; @@ -43,12 +44,70 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, MltVideoProfile profile, QUndoGroup *u QFile file(tmpFile); m_document.setContent(&file, false); file.close(); - QDomNode infoXmlNode = m_document.elementsByTagName("kdenlive").at(0); + QDomNode infoXmlNode = m_document.elementsByTagName("kdenlivedoc").at(0); + QDomNode westley = m_document.elementsByTagName("westley").at(0); if (!infoXmlNode.isNull()) { QDomElement infoXml = infoXmlNode.toElement(); QString profilePath = infoXml.attribute("profile"); + m_startPos = infoXml.attribute("position").toInt(); if (!profilePath.isEmpty()) setProfilePath(profilePath); - } + double version = infoXml.attribute("version").toDouble(); + if (version < 0.7) convertDocument(version); + else { + //delete all mlt producers and instead, use Kdenlive saved producers + QDomNodeList prods = m_document.elementsByTagName("producer"); + int maxprod = prods.count(); + int pos = 0; + for (int i = 0; i < maxprod; i++) { + QDomNode m = prods.at(pos); + if (m.toElement().attribute("id") == "black") + pos = 1; + else westley.removeChild(m); + } + prods = m_document.elementsByTagName("kdenlive_producer"); + maxprod = prods.count(); + for (int i = 0; i < maxprod; i++) { + prods.at(0).toElement().setTagName("producer"); + westley.insertBefore(prods.at(0), QDomNode()); + } + } + QDomElement e; + QDomNodeList producers = m_document.elementsByTagName("producer"); + const int max = producers.count(); + if (max > 0) { + m_documentLoadingStep = 100.0 / (max + m_document.elementsByTagName("entry").count()); + parent->slotGotProgressInfo(i18n("Loading project clips"), (int) m_documentLoadingProgress); + } + + for (int i = 0; i < max; i++) { + e = producers.item(i).cloneNode().toElement(); + if (m_documentLoadingStep > 0) { + m_documentLoadingProgress += m_documentLoadingStep; + parent->slotGotProgressInfo(QString(), (int) m_documentLoadingProgress); + qApp->processEvents(); + } + if (!e.isNull() && e.attribute("id") != "black") { + addClip(e, e.attribute("id").toInt()); + } + } + + QDomNode markers = m_document.elementsByTagName("markers").at(0); + if (!markers.isNull()) { + QDomNodeList markerslist = markers.childNodes(); + int maxchild = markerslist.count(); + for (int k = 0; k < maxchild; k++) { + e = markerslist.at(k).toElement(); + if (e.tagName() == "marker") { + int id = e.attribute("id").toInt(); + m_clipManager->getClipById(id)->addSnapMarker(GenTime(e.attribute("time").toDouble()), e.attribute("comment")); + } + } + m_document.removeChild(markers); + } + m_document.removeChild(infoXmlNode); + + kDebug() << "Reading file: " << url.path() << ", found clips: " << producers.count(); + } else kWarning() << " NO KDENLIVE INFO FOUND IN FILE: " << url.path(); KIO::NetAccess::removeTempFile(tmpFile); } else { KMessageBox::error(parent, KIO::NetAccess::lastErrorString()); @@ -57,73 +116,86 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, MltVideoProfile profile, QUndoGroup *u // Creating new document QDomElement westley = m_document.createElement("westley"); m_document.appendChild(westley); - QDomElement doc = m_document.createElement("kdenlivedoc"); - doc.setAttribute("version", "0.6"); - westley.appendChild(doc); - QDomElement props = m_document.createElement("properties"); - doc.setAttribute("width", m_width); - doc.setAttribute("height", m_height); - doc.setAttribute("projectfps", m_fps); - doc.appendChild(props); - - - /*QDomElement westley = m_document.createElement("westley"); - m_document.appendChild(westley);*/ - QDomElement tractor = m_document.createElement("tractor"); tractor.setAttribute("id", "maintractor"); QDomElement multitrack = m_document.createElement("multitrack"); QDomElement playlist = m_document.createElement("playlist"); - QDomElement producer = m_document.createElement("producer"); - /*producer.setAttribute("mlt_service", "colour"); - producer.setAttribute("colour", "red"); - playlist.appendChild(producer);*/ - multitrack.appendChild(playlist); - QDomElement playlist1 = m_document.createElement("playlist"); - playlist1.setAttribute("id", "playlist1"); - playlist1.setAttribute("hide", "video"); - multitrack.appendChild(playlist1); - QDomElement playlist2 = m_document.createElement("playlist"); - playlist2.setAttribute("id", "playlist2"); - playlist2.setAttribute("hide", "video"); - multitrack.appendChild(playlist2); - QDomElement playlist3 = m_document.createElement("playlist"); - multitrack.appendChild(playlist3); - playlist3.setAttribute("id", "playlist3"); - QDomElement playlist4 = m_document.createElement("playlist"); - multitrack.appendChild(playlist4); - playlist4.setAttribute("id", "playlist4"); - QDomElement playlist5 = m_document.createElement("playlist"); - multitrack.appendChild(playlist5); - playlist5.setAttribute("id", "playlist5"); - tractor.appendChild(multitrack); - - for (uint i = 2; i < 6 ; i++) { + playlist.setAttribute("id", "black_track"); + westley.appendChild(playlist); + + + // create playlists + int audiotracks = 2; + int videotracks = 3; + int total = audiotracks + videotracks + 1; + + for (int i = 1; i < total; i++) { + QDomElement playlist = m_document.createElement("playlist"); + playlist.setAttribute("id", "playlist" + QString::number(i)); + westley.appendChild(playlist); + } + + QDomElement track0 = m_document.createElement("track"); + track0.setAttribute("producer", "black_track"); + tractor.appendChild(track0); + + // create audio tracks + for (int i = 1; i < audiotracks + 1; i++) { + QDomElement track = m_document.createElement("track"); + track.setAttribute("producer", "playlist" + QString::number(i)); + track.setAttribute("hide", "video"); + tractor.appendChild(track); + } + + // create video tracks + for (int i = audiotracks + 1; i < total; i++) { + QDomElement track = m_document.createElement("track"); + track.setAttribute("producer", "playlist" + QString::number(i)); + tractor.appendChild(track); + } + + for (uint i = 2; i < total ; i++) { QDomElement transition = m_document.createElement("transition"); transition.setAttribute("in", "0"); //TODO: Make audio mix last for all project duration transition.setAttribute("out", "15000"); - transition.setAttribute("a_track", QString::number(1)); - transition.setAttribute("b_track", QString::number(i)); - transition.setAttribute("mlt_service", "mix"); - transition.setAttribute("combine", "1"); - transition.setAttribute("internal_added", "237"); + + QDomElement property = m_document.createElement("property"); + property.setAttribute("name", "a_track"); + QDomText value = m_document.createTextNode(QString::number(1)); + property.appendChild(value); + transition.appendChild(property); + + property = m_document.createElement("property"); + property.setAttribute("name", "b_track"); + value = m_document.createTextNode(QString::number(i)); + property.appendChild(value); + transition.appendChild(property); + + property = m_document.createElement("property"); + property.setAttribute("name", "mlt_service"); + value = m_document.createTextNode("mix"); + property.appendChild(value); + transition.appendChild(property); + + property = m_document.createElement("property"); + property.setAttribute("name", "combine"); + value = m_document.createTextNode("1"); + property.appendChild(value); + transition.appendChild(property); + + property = m_document.createElement("property"); + property.setAttribute("name", "internal_added"); + value = m_document.createTextNode("237"); + property.appendChild(value); + transition.appendChild(property); tractor.appendChild(transition); } - QDomElement playlistmain = m_document.createElement("playlist"); - playlistmain.setAttribute("id", "playlistmain"); - QDomElement playentry = m_document.createElement("entry"); - playentry.setAttribute("producer", "maintractor"); - playentry.setAttribute("in", "0"); - playentry.setAttribute("out", "15000"); - playlistmain.appendChild(playentry); - doc.appendChild(tractor); - doc.appendChild(playlistmain); - + westley.appendChild(tractor); } m_scenelist = m_document.toString(); - kDebug() << "scenelist" << m_scenelist; + // kDebug() << "scenelist" << m_scenelist; if (m_fps == 30000.0 / 1001.0) m_timecode.setFormat(30, true); else m_timecode.setFormat((int) m_fps); } @@ -133,13 +205,139 @@ KdenliveDoc::~KdenliveDoc() { delete m_clipManager; } -QDomElement KdenliveDoc::documentInfoXml() { - //QDomDocument doc; - QDomElement addedXml = m_document.createElement("kdenlive"); +void KdenliveDoc::convertDocument(double version) { + // Opening a old Kdenlive document + QDomNode westley = m_document.elementsByTagName("westley").at(1); + QDomNode tractor = m_document.elementsByTagName("tractor").at(0); + QDomNode kdenlivedoc = m_document.elementsByTagName("kdenlivedoc").at(0); + QDomNode multitrack = m_document.elementsByTagName("multitrack").at(0); + QDomNodeList playlists = m_document.elementsByTagName("playlist"); + + QDomNode props = m_document.elementsByTagName("properties").at(0).toElement(); + QString profile = props.toElement().attribute("videoprofile"); + if (profile == "dv_wide") profile = "dv_pal_wide"; + if (!profile.isEmpty()) { + setProfilePath(profile); + } else setProfilePath("dv_pal"); + + // 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); + } + track.setAttribute("producer", playlist_id); + tractor.appendChild(track); + } + tractor.removeChild(multitrack); + + // audio track mixing transitions should not be added to track view, so add required attribute + QDomNodeList transitions = m_document.elementsByTagName("transition"); + max = transitions.count(); + for (int i = 0; i < max; i++) { + QDomElement tr = transitions.at(i).toElement(); + if (tr.attribute("combine") == "1" && tr.attribute("mlt_service") == "mix") { + QDomElement property = m_document.createElement("property"); + property.setAttribute("name", "internal_added"); + QDomText value = m_document.createTextNode("237"); + property.appendChild(value); + tr.appendChild(property); + } else { + // convert transition + QDomNamedNodeMap attrs = tr.attributes(); + for (unsigned 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"); + property.setAttribute("name", attrName); + QDomText value = m_document.createTextNode(attrs.item(j).nodeValue()); + property.appendChild(value); + tr.appendChild(property); + } + } + } + } + + // move transitions after tracks + for (int i = 0; i < max; i++) { + tractor.insertAfter(transitions.at(0), QDomNode()); + } + + QDomElement markers = m_document.createElement("markers"); + + // change producer names + QDomNodeList producers = m_document.elementsByTagName("producer"); + max = producers.count(); + for (int i = 0; i < max; i++) { + QDomElement prod = producers.at(0).toElement(); + QDomNode m = prod.firstChild(); + if (!m.isNull() && m.toElement().tagName() == "markers") { + QDomNodeList prodchilds = m.childNodes(); + int maxchild = prodchilds.count(); + for (int k = 0; k < maxchild; k++) { + QDomElement mark = prodchilds.at(0).toElement(); + mark.setAttribute("id", prod.attribute("id")); + markers.insertAfter(mark, QDomNode()); + } + prod.removeChild(m); + } + int duration = prod.attribute("duration").toInt(); + if (duration > 0) prod.setAttribute("out", QString::number(duration)); + westley.insertBefore(prod, QDomNode()); + } + + QDomNode westley0 = m_document.elementsByTagName("westley").at(0); + if (!markers.firstChild().isNull()) westley0.appendChild(markers); + westley0.removeChild(kdenlivedoc); + + QDomNodeList elements = westley.childNodes(); + max = elements.count(); + for (int i = 0; i < max; i++) { + QDomElement prod = elements.at(0).toElement(); + westley0.insertAfter(prod, QDomNode()); + } + + westley0.removeChild(westley); + + //kDebug() << "///////////////// CONVERTED DOC:"; + //kDebug() << m_document.toString(); + //kDebug() << "///////////////// END CONVERTED DOC:"; +} + +QDomElement KdenliveDoc::documentInfoXml(QDomElement timelineInfo) { + QDomDocument doc; + QDomElement e; + QDomElement addedXml = doc.createElement("kdenlivedoc"); + QDomElement markers = doc.createElement("markers"); addedXml.setAttribute("version", "0.7"); addedXml.setAttribute("profile", profilePath()); - kDebug() << m_document.toString(); - return m_document.documentElement(); + addedXml.setAttribute("position", m_render->seekPosition().frames(m_fps)); + QList list = m_clipManager->documentClipList(); + for (int i = 0; i < list.count(); i++) { + e = list.at(i)->toXML(); + e.setTagName("kdenlive_producer"); + addedXml.appendChild(doc.importNode(e, true)); + QList < CommentedTime > marks = list.at(i)->commentedSnapMarkers(); + for (int j = 0; j < marks.count(); j++) { + QDomElement marker = doc.createElement("marker"); + marker.setAttribute("time", marks.at(j).time().ms() / 1000); + marker.setAttribute("comment", marks.at(j).comment()); + marker.setAttribute("id", e.attribute("id")); + markers.appendChild(marker); + } + } + addedXml.appendChild(markers); + addedXml.appendChild(doc.importNode(timelineInfo, true)); + //kDebug() << m_document.toString(); + return addedXml; } @@ -147,6 +345,11 @@ ClipManager *KdenliveDoc::clipManager() { return m_clipManager; } +KUrl KdenliveDoc::projectFolder() const { + if (m_projectFolder.isEmpty()) return KUrl(KStandardDirs::locateLocal("appdata", "/projects/")); + return m_projectFolder; +} + QString KdenliveDoc::getDocumentStandard() { //WARNING: this way to tell the video standard is a bit hackish... if (m_profile.description.contains("pal", Qt::CaseInsensitive) || m_profile.description.contains("25", Qt::CaseInsensitive) || m_profile.description.contains("50", Qt::CaseInsensitive)) return "PAL"; @@ -167,8 +370,13 @@ void KdenliveDoc::setProfilePath(QString path) { else m_timecode.setFormat((int) m_fps); } -void KdenliveDoc::setThumbsProgress(KUrl url, int progress) { - emit thumbsProgress(url, progress); +void KdenliveDoc::setThumbsProgress(const QString &message, int progress) { + emit progressInfo(message, progress); +} + +void KdenliveDoc::loadingProgressed() { + m_documentLoadingProgress += m_documentLoadingStep; + emit progressInfo(QString(), (int) m_documentLoadingProgress); } KUndoStack *KdenliveDoc::commandStack() { @@ -177,7 +385,10 @@ KUndoStack *KdenliveDoc::commandStack() { void KdenliveDoc::setRenderer(Render *render) { m_render = render; - if (m_render) m_render->setSceneList(m_scenelist); + emit progressInfo(i18n("Loading playlist..."), 0); + qApp->processEvents(); + if (m_render) m_render->setSceneList(m_scenelist, m_startPos); + emit progressInfo(QString(), -1); } Render *KdenliveDoc::renderer() { @@ -283,7 +494,7 @@ void KdenliveDoc::setModified(bool mod) { emit docModified(m_modified); } -bool KdenliveDoc::isModified() { +bool KdenliveDoc::isModified() const { return m_modified; } @@ -337,6 +548,12 @@ void KdenliveDoc::slotAddClipFile(const KUrl url, const QString group, const int setModified(true); } +void KdenliveDoc::slotAddTextClipFile(const QString path, const QString group, const int groupId) { + kDebug() << "///////// DOCUM, ADD TXT CLP: " << path; + m_clipManager->slotAddTextClipFile(path, group, groupId); + setModified(true); +} + void KdenliveDoc::slotAddFolder(const QString folderName) { AddFolderCommand *command = new AddFolderCommand(this, folderName, m_clipManager->getFreeClipId(), true); commandStack()->push(command); @@ -368,9 +585,39 @@ void KdenliveDoc::slotAddColorClipFile(const QString name, const QString color, setModified(true); } +void KdenliveDoc::slotAddSlideshowClipFile(const QString name, const QString path, int count, const QString duration, bool loop, const QString group, const int groupId) { + m_clipManager->slotAddSlideshowClipFile(name, path, count, duration, loop, group, groupId); + setModified(true); +} + void KdenliveDoc::slotCreateTextClip(QString group, int groupId) { - TitleWidget *dia_ui = new TitleWidget(m_render, 0); + QString titlesFolder = projectFolder().path() + "/titles/"; + KStandardDirs::makeDir(titlesFolder); + TitleWidget *dia_ui = new TitleWidget(KUrl(), titlesFolder, m_render, kapp->activeWindow()); + if (dia_ui->exec() == QDialog::Accepted) { + QString titleName = "title"; + int counter = 0; + QString path = titlesFolder + titleName + QString::number(counter).rightJustified(3, '0', false); + while (QFile::exists(path + ".kdenlivetitle")) { + counter++; + path = titlesFolder + titleName + QString::number(counter).rightJustified(3, '0', false); + } + QPixmap pix = dia_ui->renderedPixmap(); + pix.save(path + ".png"); + dia_ui->saveTitle(path + ".kdenlivetitle"); + slotAddTextClipFile(path, QString(), -1); + } + delete dia_ui; +} + +void KdenliveDoc::editTextClip(QString path, int id) { + TitleWidget *dia_ui = new TitleWidget(KUrl(path + ".kdenlivetitle"), path, m_render, kapp->activeWindow()); if (dia_ui->exec() == QDialog::Accepted) { + QPixmap pix = dia_ui->renderedPixmap(); + pix.save(path + ".png"); + dia_ui->saveTitle(path + ".kdenlivetitle"); + //slotAddClipFile(KUrl("/tmp/kdenlivetitle.png"), QString(), -1); + emit refreshClipThumbnail(id); } delete dia_ui; }