X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fkdenlivedoc.cpp;h=0dfdfb224b872e32babdefea2a31f19914f2878d;hb=3ec710471ae45caa311fae972c02aece12e1c799;hp=624a3e93acf082f138b0e39e835d503c9d72826c;hpb=2117079e79767c3d63f7f116a47681b2180aacd3;p=kdenlive diff --git a/src/kdenlivedoc.cpp b/src/kdenlivedoc.cpp index 624a3e93..0dfdfb22 100644 --- a/src/kdenlivedoc.cpp +++ b/src/kdenlivedoc.cpp @@ -36,7 +36,8 @@ #include "titlewidget.h" #include "mainwindow.h" -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) { + +KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup *undoGroup, const QString &profileName, MainWindow *parent): QObject(parent), m_render(NULL), 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_clipManager = new ClipManager(this); if (!url.isEmpty()) { QString tmpFile; @@ -50,7 +51,8 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, MltVideoPro QDomElement infoXml = infoXmlNode.toElement(); QString profilePath = infoXml.attribute("profile"); m_startPos = infoXml.attribute("position").toInt(); - if (!profilePath.isEmpty()) setProfilePath(profilePath); + m_zoom = infoXml.attribute("zoom", "7").toInt(); + setProfilePath(profilePath); double version = infoXml.attribute("version").toDouble(); if (version < 0.7) convertDocument(version); else { @@ -60,8 +62,9 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, MltVideoPro int pos = 0; for (int i = 0; i < maxprod; i++) { QDomNode m = prods.at(pos); - if (m.toElement().attribute("id") == "black") - pos = 1; + QString prodId = m.toElement().attribute("id"); + if (prodId == "black" || prodId.startsWith("slowmotion")) + pos++; else westley.removeChild(m); } prods = m_document.elementsByTagName("kdenlive_producer"); @@ -86,8 +89,9 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, MltVideoPro parent->slotGotProgressInfo(QString(), (int) m_documentLoadingProgress); qApp->processEvents(); } - if (!e.isNull() && e.attribute("id") != "black") { - addClip(e, e.attribute("id").toInt()); + QString prodId = e.attribute("id"); + if (!e.isNull() && prodId != "black" && !prodId.startsWith("slowmotion")/*&& prodId.toInt() > 0*/) { + addClip(e, prodId); } } @@ -98,111 +102,162 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, MltVideoPro 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_clipManager->getClipById(e.attribute("id"))->addSnapMarker(GenTime(e.attribute("time").toDouble()), e.attribute("comment")); } } - m_document.removeChild(markers); + westley.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(); + } else { + parent->slotGotProgressInfo(i18n("File %1 is not a Kdenlive project file."), 100); + kWarning() << " NO KDENLIVE INFO FOUND IN FILE: " << url.path(); + m_document = createEmptyDocument(); + setProfilePath(profileName); + } KIO::NetAccess::removeTempFile(tmpFile); } else { KMessageBox::error(parent, KIO::NetAccess::lastErrorString()); + parent->slotGotProgressInfo(i18n("File %1 is not a Kdenlive project file."), 100); + m_document = createEmptyDocument(); + setProfilePath(profileName); } } else { - // Creating new document - 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"); - playlist.setAttribute("id", "black_track"); - westley.appendChild(playlist); + m_document = createEmptyDocument(); + setProfilePath(profileName); + } + m_scenelist = m_document.toString(); + kDebug() << "KDEnnlive document, init timecode: " << m_fps; + if (m_fps == 30000.0 / 1001.0) m_timecode.setFormat(30, true); + else m_timecode.setFormat((int) m_fps); + m_autoSaveTimer = new QTimer(this); + m_autoSaveTimer->setSingleShot(true); + connect(m_autoSaveTimer, SIGNAL(timeout()), this, SLOT(slotAutoSave())); +} - // create playlists - int audiotracks = 2; - int videotracks = 3; - int total = audiotracks + videotracks + 1; +KdenliveDoc::~KdenliveDoc() { + delete m_commandStack; + delete m_clipManager; + delete m_autoSaveTimer; + m_autosave->remove(); +} - for (int i = 1; i < total; i++) { - QDomElement playlist = m_document.createElement("playlist"); - playlist.setAttribute("id", "playlist" + QString::number(i)); - westley.appendChild(playlist); - } +QDomDocument KdenliveDoc::createEmptyDocument() { + // Creating new document + QDomDocument doc; + QDomElement westley = doc.createElement("westley"); + doc.appendChild(westley); - QDomElement track0 = m_document.createElement("track"); - track0.setAttribute("producer", "black_track"); - tractor.appendChild(track0); + QDomElement tractor = doc.createElement("tractor"); + tractor.setAttribute("id", "maintractor"); + QDomElement multitrack = doc.createElement("multitrack"); + QDomElement playlist = doc.createElement("playlist"); + playlist.setAttribute("id", "black_track"); + westley.appendChild(playlist); - // 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); - } + // create playlists + const int audiotracks = 2; + const int videotracks = 3; + int total = audiotracks + videotracks + 1; - 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"); + for (int i = 1; i < total; i++) { + QDomElement playlist = doc.createElement("playlist"); + playlist.setAttribute("id", "playlist" + QString::number(i)); + westley.appendChild(playlist); + } - 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); + QDomElement track0 = doc.createElement("track"); + track0.setAttribute("producer", "black_track"); + tractor.appendChild(track0); - property = m_document.createElement("property"); - property.setAttribute("name", "b_track"); - value = m_document.createTextNode(QString::number(i)); - property.appendChild(value); - transition.appendChild(property); + // create audio tracks + for (int i = 1; i < audiotracks + 1; i++) { + QDomElement track = doc.createElement("track"); + track.setAttribute("producer", "playlist" + QString::number(i)); + track.setAttribute("hide", "video"); + tractor.appendChild(track); + } - property = m_document.createElement("property"); - property.setAttribute("name", "mlt_service"); - value = m_document.createTextNode("mix"); - property.appendChild(value); - transition.appendChild(property); + // create video tracks + for (int i = audiotracks + 1; i < total; i++) { + QDomElement track = doc.createElement("track"); + track.setAttribute("producer", "playlist" + QString::number(i)); + tractor.appendChild(track); + } - property = m_document.createElement("property"); - property.setAttribute("name", "combine"); - value = m_document.createTextNode("1"); - property.appendChild(value); - transition.appendChild(property); + for (uint i = 2; i < total ; i++) { + QDomElement transition = doc.createElement("transition"); + transition.setAttribute("always_active", "1"); + + QDomElement property = doc.createElement("property"); + property.setAttribute("name", "a_track"); + QDomText value = doc.createTextNode(QString::number(1)); + property.appendChild(value); + transition.appendChild(property); + + property = doc.createElement("property"); + property.setAttribute("name", "b_track"); + value = doc.createTextNode(QString::number(i)); + property.appendChild(value); + transition.appendChild(property); + + property = doc.createElement("property"); + property.setAttribute("name", "mlt_service"); + value = doc.createTextNode("mix"); + property.appendChild(value); + transition.appendChild(property); + + property = doc.createElement("property"); + property.setAttribute("name", "combine"); + value = doc.createTextNode("1"); + property.appendChild(value); + transition.appendChild(property); + + property = doc.createElement("property"); + property.setAttribute("name", "internal_added"); + value = doc.createTextNode("237"); + property.appendChild(value); + transition.appendChild(property); + tractor.appendChild(transition); + } + westley.appendChild(tractor); + return doc; +} - property = m_document.createElement("property"); - property.setAttribute("name", "internal_added"); - value = m_document.createTextNode("237"); - property.appendChild(value); - transition.appendChild(property); - tractor.appendChild(transition); + +void KdenliveDoc::syncGuides(QList guides) { + QDomDocument doc; + QDomElement e; + m_guidesXml.clear(); + m_guidesXml = doc.createElement("guides"); + for (int i = 0; i < guides.count(); i++) { + e = doc.createElement("guide"); + e.setAttribute("time", guides.at(i)->position().ms() / 1000); + e.setAttribute("comment", guides.at(i)->label()); + m_guidesXml.appendChild(e); + } +} + +void KdenliveDoc::slotAutoSave() { + if (m_render) { + if (!m_autosave->isOpen() && !m_autosave->open(QIODevice::ReadWrite)) { + // show error: could not open the autosave file + kDebug() << "ERROR; CANNOT CREATE AUTOSAVE FILE"; } - westley.appendChild(tractor); + kDebug() << "// AUTOSAVE FILE: " << m_autosave->fileName(); + m_render->saveSceneList(m_autosave->fileName(), documentInfoXml()); } - m_scenelist = m_document.toString(); - // kDebug() << "scenelist" << m_scenelist; - if (m_fps == 30000.0 / 1001.0) m_timecode.setFormat(30, true); - else m_timecode.setFormat((int) m_fps); } -KdenliveDoc::~KdenliveDoc() { - delete m_commandStack; - delete m_clipManager; +void KdenliveDoc::setZoom(int factor) { + m_zoom = factor; +} + +int KdenliveDoc::zoom() const { + return m_zoom; } void KdenliveDoc::convertDocument(double version) { @@ -213,12 +268,12 @@ void KdenliveDoc::convertDocument(double version) { QDomNode multitrack = m_document.elementsByTagName("multitrack").at(0); QDomNodeList playlists = m_document.elementsByTagName("playlist"); + m_startPos = kdenlivedoc.toElement().attribute("timeline_position").toInt(); + 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"); + setProfilePath(profile); // move playlists outside of tractor and add the tracks instead int max = playlists.count(); @@ -235,7 +290,8 @@ void KdenliveDoc::convertDocument(double version) { pl.setAttribute("id", playlist_id); } track.setAttribute("producer", playlist_id); - tractor.appendChild(track); + //tractor.appendChild(track); + tractor.insertAfter(track, QDomNode()); } tractor.removeChild(multitrack); @@ -271,10 +327,91 @@ void KdenliveDoc::convertDocument(double version) { tractor.insertAfter(transitions.at(0), QDomNode()); } - QDomElement markers = m_document.createElement("markers"); + // Fix filters format + QDomNodeList entries = m_document.elementsByTagName("entry"); + max = entries.count(); + for (int i = 0; i < max; i++) { + QString last_id; + int effectix = 0; + QDomNode m = entries.at(i).firstChild(); + while (!m.isNull()) { + if (m.toElement().tagName() == "filter") { + QDomElement filt = m.toElement(); + QDomNamedNodeMap attrs = filt.attributes(); + QString current_id = filt.attribute("kdenlive_id"); + if (current_id != last_id) { + effectix++; + last_id = current_id; + } + QDomElement e = m_document.createElement("property"); + e.setAttribute("name", "kdenlive_ix"); + QDomText value = m_document.createTextNode(QString::number(effectix)); + e.appendChild(value); + filt.appendChild(e); + for (int j = 0; j < attrs.count(); j++) { + QDomAttr a = attrs.item(j).toAttr(); + if (!a.isNull()) { + kDebug() << " FILTER; adding :" << a.name() << ":" << a.value(); + QDomElement e = m_document.createElement("property"); + e.setAttribute("name", a.name()); + QDomText value = m_document.createTextNode(a.value()); + e.appendChild(value); + filt.appendChild(e); + + } + } + } + m = m.nextSibling(); + } + } - // change producer names - QDomNodeList producers = m_document.elementsByTagName("producer"); + /* + QDomNodeList filters = m_document.elementsByTagName("filter"); + max = filters.count(); + QString last_id; + int effectix = 0; + for (int i = 0; i < max; i++) { + QDomElement filt = filters.at(i).toElement(); + QDomNamedNodeMap attrs = filt.attributes(); + QString current_id = filt.attribute("kdenlive_id"); + if (current_id != last_id) { + effectix++; + last_id = current_id; + } + QDomElement e = m_document.createElement("property"); + e.setAttribute("name", "kdenlive_ix"); + QDomText value = m_document.createTextNode(QString::number(1)); + e.appendChild(value); + filt.appendChild(e); + for (int j = 0; j < attrs.count(); j++) { + QDomAttr a = attrs.item(j).toAttr(); + if (!a.isNull()) { + kDebug() << " FILTER; adding :" << a.name() << ":" << a.value(); + QDomElement e = m_document.createElement("property"); + e.setAttribute("name", a.name()); + QDomText value = m_document.createTextNode(a.value()); + e.appendChild(value); + filt.appendChild(e); + } + } + }*/ + + // fix slowmotion + QDomNodeList producers = westley.toElement().elementsByTagName("producer"); + max = producers.count(); + for (int i = 0; i < max; i++) { + QDomElement prod = producers.at(i).toElement(); + if (prod.attribute("mlt_service") == "framebuffer") { + QString slowmotionprod = prod.attribute("resource"); + slowmotionprod.replace(':', '?'); + kDebug() << "// FOUND WRONG SLOWMO, new: " << slowmotionprod; + prod.setAttribute("resource", slowmotionprod); + } + } + + // move producers to correct place, markers to a global list, fix clip descriptions + QDomElement markers = m_document.createElement("markers"); + producers = m_document.elementsByTagName("producer"); max = producers.count(); for (int i = 0; i < max; i++) { QDomElement prod = producers.at(0).toElement(); @@ -288,6 +425,12 @@ void KdenliveDoc::convertDocument(double version) { markers.insertAfter(mark, QDomNode()); } prod.removeChild(m); + } else if (m.isText()) { + QString comment = m.nodeValue(); + if (!comment.isEmpty()) { + prod.setAttribute("description", comment); + } + prod.removeChild(m); } int duration = prod.attribute("duration").toInt(); if (duration > 0) prod.setAttribute("out", QString::number(duration)); @@ -312,7 +455,7 @@ void KdenliveDoc::convertDocument(double version) { //kDebug() << "///////////////// END CONVERTED DOC:"; } -QDomElement KdenliveDoc::documentInfoXml(QDomElement timelineInfo) { +QDomElement KdenliveDoc::documentInfoXml() { QDomDocument doc; QDomElement e; QDomElement addedXml = doc.createElement("kdenlivedoc"); @@ -320,6 +463,7 @@ QDomElement KdenliveDoc::documentInfoXml(QDomElement timelineInfo) { addedXml.setAttribute("version", "0.7"); addedXml.setAttribute("profile", profilePath()); addedXml.setAttribute("position", m_render->seekPosition().frames(m_fps)); + addedXml.setAttribute("zoom", m_zoom); QList list = m_clipManager->documentClipList(); for (int i = 0; i < list.count(); i++) { e = list.at(i)->toXML(); @@ -335,7 +479,7 @@ QDomElement KdenliveDoc::documentInfoXml(QDomElement timelineInfo) { } } addedXml.appendChild(markers); - addedXml.appendChild(doc.importNode(timelineInfo, true)); + if (!m_guidesXml.isNull()) addedXml.appendChild(doc.importNode(m_guidesXml, true)); //kDebug() << m_document.toString(); return addedXml; } @@ -361,15 +505,22 @@ QString KdenliveDoc::profilePath() const { } void KdenliveDoc::setProfilePath(QString path) { - KdenliveSettings::setCurrent_profile(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; m_width = m_profile.width; m_height = m_profile.height; + kDebug() << "KDEnnlive document, init timecode from path: " << path << ", " << m_fps; if (m_fps == 30000.0 / 1001.0) m_timecode.setFormat(30, true); else m_timecode.setFormat((int) m_fps); } +const double KdenliveDoc::dar() { + return (double) m_profile.display_aspect_num / m_profile.display_aspect_den; +} + void KdenliveDoc::setThumbsProgress(const QString &message, int progress) { emit progressInfo(message, progress); } @@ -379,7 +530,7 @@ void KdenliveDoc::loadingProgressed() { emit progressInfo(QString(), (int) m_documentLoadingProgress); } -KUndoStack *KdenliveDoc::commandStack() { +QUndoStack *KdenliveDoc::commandStack() { return m_commandStack; } @@ -387,7 +538,7 @@ void KdenliveDoc::setRenderer(Render *render) { m_render = render; emit progressInfo(i18n("Loading playlist..."), 0); qApp->processEvents(); - if (m_render) m_render->setSceneList(m_scenelist, m_startPos); + if (m_render) m_render->setSceneList(m_document.toString(), m_startPos); emit progressInfo(QString(), -1); } @@ -395,21 +546,27 @@ Render *KdenliveDoc::renderer() { return m_render; } -void KdenliveDoc::updateClip(int id) { +void KdenliveDoc::updateClip(const QString &id) { emit updateClipDisplay(id); } +void KdenliveDoc::updateAllProjectClips() { + QList list = m_clipManager->documentClipList(); + for (int i = 0; i < list.count(); i++) + emit updateClipDisplay(list.at(i)->getId()); +} + int KdenliveDoc::getFramePos(QString duration) { return m_timecode.getFrameCount(duration, m_fps); } -QString KdenliveDoc::producerName(int id) { +QString KdenliveDoc::producerName(const QString &id) { QString result = "unnamed"; 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").toInt() == id) { + if (e.attribute("id") != "black" && e.attribute("id") == id) { result = e.attribute("name"); if (result.isEmpty()) result = KUrl(e.attribute("resource")).fileName(); break; @@ -418,25 +575,25 @@ QString KdenliveDoc::producerName(int id) { return result; } -void KdenliveDoc::setProducerDuration(int id, int duration) { +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").toInt() == id) { + if (e.attribute("id") != "black" && e.attribute("id") == id) { e.setAttribute("duration", QString::number(duration)); break; } } } -int KdenliveDoc::getProducerDuration(int id) { +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").toInt() == id) { + if (e.attribute("id") != "black" && e.attribute("id") == id) { result = e.attribute("duration").toInt(); break; } @@ -489,6 +646,9 @@ void KdenliveDoc::setUrl(KUrl url) { } void KdenliveDoc::setModified(bool mod) { + if (!m_url.isEmpty() && mod && KdenliveSettings::crashrecovery()) { + m_autoSaveTimer->start(3000); + } if (mod == m_modified) return; m_modified = mod; emit docModified(m_modified); @@ -505,31 +665,31 @@ QString KdenliveDoc::description() const { return m_url.fileName() + " / " + m_profile.description; } -void KdenliveDoc::addClip(const QDomElement &elem, const int clipId) { +void KdenliveDoc::addClip(const QDomElement &elem, const QString &clipId) { DocClipBase *clip = new DocClipBase(m_clipManager, elem, clipId); kDebug() << "///////// DOCUM, CREATING NEW CLIP, ID:" << clipId << ", PAR ID:" << elem.attribute("groupid"); m_clipManager->addClip(clip); emit addProjectClip(clip); } -void KdenliveDoc::addFolder(const QString foldername, int clipId, bool edit) { +void KdenliveDoc::addFolder(const QString foldername, const QString &clipId, bool edit) { emit addProjectFolder(foldername, clipId, false, edit); } -void KdenliveDoc::deleteFolder(const QString foldername, int clipId) { +void KdenliveDoc::deleteFolder(const QString foldername, const QString &clipId) { emit addProjectFolder(foldername, clipId, true); } -void KdenliveDoc::deleteProjectClip(QList ids) { +void KdenliveDoc::deleteProjectClip(QList ids) { for (int i = 0; i < ids.size(); ++i) { - emit deletTimelineClip(ids.at(i)); + emit deleteTimelineClip(ids.at(i)); m_clipManager->slotDeleteClip(ids.at(i)); } setModified(true); } -void KdenliveDoc::deleteProjectFolder(QMap map) { - QMapIterator i(map); +void KdenliveDoc::deleteProjectFolder(QMap map) { + QMapIterator i(map); while (i.hasNext()) { i.next(); slotDeleteFolder(i.key(), i.value()); @@ -537,60 +697,68 @@ void KdenliveDoc::deleteProjectFolder(QMap map) { setModified(true); } -void KdenliveDoc::deleteClip(const uint clipId) { +void KdenliveDoc::deleteClip(const QString &clipId) { emit signalDeleteProjectClip(clipId); m_clipManager->deleteClip(clipId); } -void KdenliveDoc::slotAddClipFile(const KUrl url, const QString group, const int 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; m_clipManager->slotAddClipFile(url, group, groupId); + emit selectLastAddedClip(QString::number(m_clipManager->lastClipId())); setModified(true); } -void KdenliveDoc::slotAddTextClipFile(const QString path, const QString group, const int groupId) { +void KdenliveDoc::slotAddTextClipFile(const QString path, const QString xml, const QString group, const QString &groupId) { kDebug() << "///////// DOCUM, ADD TXT CLP: " << path; - m_clipManager->slotAddTextClipFile(path, group, groupId); + m_clipManager->slotAddTextClipFile(path, xml, group, groupId); setModified(true); } void KdenliveDoc::slotAddFolder(const QString folderName) { - AddFolderCommand *command = new AddFolderCommand(this, folderName, m_clipManager->getFreeClipId(), true); + AddFolderCommand *command = new AddFolderCommand(this, folderName, QString::number(m_clipManager->getFreeClipId()), true); commandStack()->push(command); setModified(true); } -void KdenliveDoc::slotDeleteFolder(const QString folderName, const int id) { +void KdenliveDoc::slotDeleteFolder(const QString folderName, const QString &id) { AddFolderCommand *command = new AddFolderCommand(this, folderName, id, false); commandStack()->push(command); setModified(true); } -void KdenliveDoc::slotEditFolder(const QString newfolderName, const QString oldfolderName, int clipId) { +void KdenliveDoc::slotEditFolder(const QString newfolderName, const QString oldfolderName, const QString &clipId) { EditFolderCommand *command = new EditFolderCommand(this, newfolderName, oldfolderName, clipId, false); commandStack()->push(command); setModified(true); } -int KdenliveDoc::getFreeClipId() { - return m_clipManager->getFreeClipId(); +const QString&KdenliveDoc::getFreeClipId() { + return QString::number(m_clipManager->getFreeClipId()); } -DocClipBase *KdenliveDoc::getBaseClip(int 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 int groupId) { +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, bool loop, const QString group, const int groupId) { - m_clipManager->slotAddSlideshowClipFile(name, path, count, duration, loop, group, groupId); +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, int 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()); @@ -604,18 +772,23 @@ void KdenliveDoc::slotCreateTextClip(QString group, int groupId) { } QPixmap pix = dia_ui->renderedPixmap(); pix.save(path + ".png"); - dia_ui->saveTitle(path + ".kdenlivetitle"); - slotAddTextClipFile(path, QString(), -1); + //dia_ui->saveTitle(path + ".kdenlivetitle"); + slotAddTextClipFile(path, dia_ui->xml().toString(), QString(), QString()); } delete dia_ui; } -void KdenliveDoc::editTextClip(QString path, int id) { - TitleWidget *dia_ui = new TitleWidget(KUrl(path + ".kdenlivetitle"), path, m_render, kapp->activeWindow()); +void KdenliveDoc::editTextClip(QString path, const QString &id) { + DocClipBase *clip = m_clipManager->getClipById(id); + if (!clip) return; + TitleWidget *dia_ui = new TitleWidget(KUrl()/*path + ".kdenlivetitle")*/, path, m_render, kapp->activeWindow()); + QDomDocument doc; + doc.setContent(clip->getProperty("xmldata")); + dia_ui->setXml(doc); if (dia_ui->exec() == QDialog::Accepted) { QPixmap pix = dia_ui->renderedPixmap(); pix.save(path + ".png"); - dia_ui->saveTitle(path + ".kdenlivetitle"); + //dia_ui->saveTitle(path + ".kdenlivetitle"); //slotAddClipFile(KUrl("/tmp/kdenlivetitle.png"), QString(), -1); emit refreshClipThumbnail(id); }