m_zoom = infoXml.attribute("zoom", "7").toInt();
setProfilePath(profilePath);
double version = infoXml.attribute("version").toDouble();
- if (version < 0.8) 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);
- QString prodId = m.toElement().attribute("id");
- if (prodId == "black" || prodId.startsWith("slowmotion"))
- pos++;
- 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());
- }*/
+
+ // Upgrade old Kdenlive documents to current version
+ convertDocument(version);
+
+ // Build tracks
+ QString tracks = infoXml.attribute("tracks");
+ TrackInfo videoTrack;
+ videoTrack.type = VIDEOTRACK;
+ videoTrack.isMute = false;
+ videoTrack.isBlind = false;
+
+ TrackInfo audioTrack;
+ audioTrack.type = AUDIOTRACK;
+ audioTrack.isMute = false;
+ audioTrack.isBlind = true;
+ for (int i = 0; i < tracks.size(); i++) {
+ if (tracks.data()[i] == 'v') m_tracksList.append(videoTrack);
+ else m_tracksList.append(audioTrack);
}
+
+
QDomElement e;
QDomNodeList producers = m_document.elementsByTagName("producer");
QDomNodeList infoproducers = m_document.elementsByTagName("kdenlive_producer");
QDomElement westley = doc.createElement("westley");
doc.appendChild(westley);
+
+ TrackInfo videoTrack;
+ videoTrack.type = VIDEOTRACK;
+ videoTrack.isMute = false;
+ videoTrack.isBlind = false;
+
+ TrackInfo audioTrack;
+ audioTrack.type = AUDIOTRACK;
+ audioTrack.isMute = false;
+ audioTrack.isBlind = true;
+
QDomElement tractor = doc.createElement("tractor");
tractor.setAttribute("id", "maintractor");
QDomElement multitrack = doc.createElement("multitrack");
track.setAttribute("producer", "playlist" + QString::number(i));
track.setAttribute("hide", "video");
tractor.appendChild(track);
+ m_tracksList.append(audioTrack);
}
// create video tracks
QDomElement track = doc.createElement("track");
track.setAttribute("producer", "playlist" + QString::number(i));
tractor.appendChild(track);
+ m_tracksList.append(videoTrack);
}
for (uint i = 2; i < total ; i++) {
void KdenliveDoc::convertDocument(double version) {
kDebug() << "Opening a document with version " << version;
+ if (version == 0.8) {
+ // Add the tracks information
+ QString tracksOrder;
+ QDomNodeList tracks = m_document.elementsByTagName("track");
+ int max = tracks.count();
+ for (int i = 0; i < max; i++) {
+ QDomElement t = tracks.at(i).toElement();
+ if (t.attribute("hide") == "video") tracksOrder.append('a');
+ else tracksOrder.append('v');
+ }
+ QDomNode kdenlivedoc = m_document.elementsByTagName("kdenlivedoc").at(0);
+ QDomElement infoXml = kdenlivedoc.toElement();
+ QString currentTrackOrder = infoXml.attribute("tracks");
+ if (currentTrackOrder.isEmpty()) infoXml.setAttribute("tracks", tracksOrder);
+
+ return;
+ }
+
// Opening a old Kdenlive document
if (version == 0.7) {
kDebug() << "Unable to open document with version " << version;
// TODO: convert 0.7 files to the new document format.
return;
}
+
+ QString tracksOrder;
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");
- m_startPos = kdenlivedoc.toElement().attribute("timeline_position").toInt();
+ //m_startPos = kdenlivedoc.toElement().attribute("timeline_position").toInt();
QDomNode props = m_document.elementsByTagName("properties").at(0).toElement();
QString profile = props.toElement().attribute("videoprofile");
+ m_startPos = props.toElement().attribute("timeline_position").toInt();
if (profile == "dv_wide") profile = "dv_pal_wide";
setProfilePath(profile);
QDomElement pl = n.toElement();
QDomElement track = m_document.createElement("track");
QString trackType = pl.attribute("hide");
- if (!trackType.isEmpty()) track.setAttribute("hide", trackType);
+ if (!trackType.isEmpty()) {
+ track.setAttribute("hide", trackType);
+ if (trackType == "video") tracksOrder.append('a');
+ else tracksOrder.append('v');
+ } else tracksOrder.append('v');
QString playlist_id = pl.attribute("id");
if (playlist_id.isEmpty()) {
playlist_id = "black_track";
max = producers.count();
for (int i = 0; i < max; i++) {
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()) {
+ 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") {
westley0.removeChild(kdenlivedoc);
QDomElement kdenlivedoc_new = m_document.createElement("kdenlivedoc");
kdenlivedoc_new.setAttribute("profile", profile);
+ kdenlivedoc_new.setAttribute("tracks", tracksOrder);
// Add all the producers that has a ressource in westley
QDomElement westley_element = westley0.toElement();
if (westley_element.isNull()) {
kWarning() << "Found producer in westley0, that was not a QDomElement";
} else {
// We have to do slightly different things, depending on the type
- kDebug() << "Converting producer element with type " << wproducer.attribute("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
+ // 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"));
- kproducer.setAttribute("description", wproducer.attribute("description"));
+ 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);
}
if (wproducer.attribute("id").toInt() > max_kproducer_id) {
westley0.removeChild(westley);
+ // experimental and probably slow
+ // adds <avfile /> information to <kdenlive_producer />
+ QDomNodeList kproducers = m_document.elementsByTagName("kdenlive_producer");
+ QDomNodeList avfiles = kdenlivedoc_old.elementsByTagName("avfile");
+ kDebug() << "found" << avfiles.count() << "<avfile />s and" << kproducers.count() << "<kdenlive_producer />s";
+ for (int i = 0; i < avfiles.count(); ++i) {
+ QDomElement avfile = avfiles.at(i).toElement();
+ QDomElement kproducer = QDomElement();
+ if (avfile.isNull())
+ kWarning() << "found an <avfile /> that is not a QDomElement";
+ else {
+ QString id = avfile.attribute("id");
+ // this is horrible, must be rewritten, it's just for test
+ for (int j = 0; j < kproducers.count(); ++j) {
+ //kDebug() << "checking <kdenlive_producer /> with id" << kproducers.at(j).toElement().attribute("id");
+ if (kproducers.at(j).toElement().attribute("id") == id) {
+ kproducer = kproducers.at(j).toElement();
+ break;
+ }
+ }
+ if (kproducer == QDomElement())
+ kWarning() << "no match for <avfile /> with id =" << id;
+ else {
+ //kDebug() << "ready to set additional <avfile />'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("frequency", avfile.attribute("frequency"));
+ if (kproducer.attribute("description").isEmpty() && !avfile.attribute("description").isEmpty())
+ kproducer.setAttribute("description", avfile.attribute("description"));
+ }
+ }
+ }
+
//kDebug() << "///////////////// CONVERTED DOC:";
- // kDebug() << m_document.toString();
+ //kDebug() << m_document.toString();
/*
QFile file( "converted.kdenlive" );
if ( file.open( QIODevice::WriteOnly ) ) {
addedXml.setAttribute("version", "0.8");
addedXml.setAttribute("profile", profilePath());
addedXml.setAttribute("position", m_render->seekPosition().frames(m_fps));
+ addedXml.setAttribute("tracks", getTracksInfo());
addedXml.setAttribute("zoom", m_zoom);
QDomElement e;
return true;
}
-QDomElement KdenliveDoc::documentInfoXml() {
- 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));
- addedXml.setAttribute("zoom", m_zoom);
- 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);
- if (!m_guidesXml.isNull()) addedXml.appendChild(doc.importNode(m_guidesXml, true));
- //kDebug() << m_document.toString();
- return addedXml;
-}
-
-
ClipManager *KdenliveDoc::clipManager() {
return m_clipManager;
}
//qApp->processEvents();
if (m_render) {
m_render->setSceneList(m_document.toString(), m_startPos);
+ kDebug() << "// SETTING SCENE LIST:\n\n" << m_document.toString();
checkProjectClips();
}
emit progressInfo(QString(), -1);
delete dia_ui;
}
+int KdenliveDoc::tracksCount() const {
+ return m_tracksList.count();
+}
+
+TrackInfo KdenliveDoc::trackInfoAt(int ix) const {
+ return m_tracksList.at(ix);
+}
+
+void KdenliveDoc::switchTrackAudio(int ix, bool hide) {
+ m_tracksList[ix].isMute = hide; // !m_tracksList.at(ix).isMute;
+}
+
+void KdenliveDoc::switchTrackVideo(int ix, bool hide) {
+ m_tracksList[ix].isBlind = hide; // !m_tracksList.at(ix).isBlind;
+}
+
+void KdenliveDoc::insertTrack(int ix, TrackInfo type) {
+ if (ix == -1) m_tracksList << type;
+ else m_tracksList.insert(ix, type);
+}
+
+void KdenliveDoc::deleteTrack(int ix) {
+ m_tracksList.removeAt(ix);
+}
+
+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;
+}
+const QList <TrackInfo> KdenliveDoc::tracksList() const {
+ return m_tracksList;
+}
+
+QPoint KdenliveDoc::getTracksCount() const {
+ int audio = 0;
+ int video = 0;
+ foreach(const TrackInfo &info, m_tracksList) {
+ if (info.type == VIDEOTRACK) video++;
+ else audio++;
+ }
+ return QPoint(video, audio);
+}
+
+QString KdenliveDoc::getTracksInfo() const {
+ QString result;
+ foreach(const TrackInfo &info, m_tracksList) {
+ if (info.type == VIDEOTRACK) result.append('v');
+ else result.append('a');
+ }
+ return result;
+}
#include "kdenlivedoc.moc"
projects / kdenlive / blobdiff