#include <KLocale>
#include <KFileDialog>
#include <KIO/NetAccess>
-
+#include <KApplication>
#include "kdenlivedoc.h"
#include "docclipbase.h"
#include "addfoldercommand.h"
#include "editfoldercommand.h"
#include "titlewidget.h"
+#include "mainwindow.h"
-KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, MltVideoProfile profile, QUndoGroup *undoGroup, QWidget *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) {
+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;
m_document.setContent(&file, false);
file.close();
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);
- QDomNodeList producers = m_document.elementsByTagName("producer"); //infoXmlNode.childNodes();
+ 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;
- for (int i = 0; i < producers.count(); i++) {
+ 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") {
- //e.setTagName("producer");
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);
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");
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 playlist_id = n.toElement().attribute("id");
+ 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";
- n.toElement().setAttribute("id", playlist_id);
+ pl.setAttribute("id", playlist_id);
}
track.setAttribute("producer", playlist_id);
tractor.appendChild(track);
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();
westley0.removeChild(westley);
- kDebug() << "///////////////// CONVERTED DOC:";
- kDebug() << m_document.toString();
- kDebug() << "///////////////// END CONVERTED DOC:";
+ //kDebug() << "///////////////// CONVERTED DOC:";
+ //kDebug() << m_document.toString();
+ //kDebug() << "///////////////// END CONVERTED DOC:";
}
-QDomElement KdenliveDoc::documentInfoXml() {
+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());
+ addedXml.setAttribute("position", m_render->seekPosition().frames(m_fps));
QList <DocClipBase*> 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;
}
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() {
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() {
void KdenliveDoc::slotCreateTextClip(QString group, int groupId) {
QString titlesFolder = projectFolder().path() + "/titles/";
KStandardDirs::makeDir(titlesFolder);
- TitleWidget *dia_ui = new TitleWidget(KUrl(), titlesFolder, m_render, 0);
+ TitleWidget *dia_ui = new TitleWidget(KUrl(), titlesFolder, m_render, kapp->activeWindow());
if (dia_ui->exec() == QDialog::Accepted) {
QString titleName = "title";
int counter = 0;
}
void KdenliveDoc::editTextClip(QString path, int id) {
- TitleWidget *dia_ui = new TitleWidget(KUrl(path + ".kdenlivetitle"), path, m_render, 0);
+ 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");
projects / kdenlive / blobdiff