| Attached Files |  manege.kdenlive [^] (26,260 bytes) 2008-10-21 10:58
kbw.gdb.output.Eqy21604 [^] (39,531 bytes) 2008-10-21 20:42
 old_documents_refusal.svn2803.patch [^] (11,261 bytes) 2008-12-18 01:39 [Show Content] [Hide Content]diff -ru kdenlive.orig/src/kdenlivedoc.cpp kdenlive/src/kdenlivedoc.cpp
--- kdenlive.orig/src/kdenlivedoc.cpp 2008-12-18 01:30:04.000000000 +0100
+++ kdenlive/src/kdenlivedoc.cpp 2008-12-18 01:22:59.000000000 +0100
@@ -61,97 +61,102 @@
double version = infoXml.attribute("version").toDouble();
// Upgrade old Kdenlive documents to current version
- convertDocument(version);
- /*
- * read again <kdenlivedoc> and <westley> to get all the new
- * stuff (convertDocument() can now do anything without breaking
- * document loading)
- */
- infoXmlNode = m_document.elementsByTagName("kdenlivedoc").at(0);
- infoXml = infoXmlNode.toElement();
- version = infoXml.attribute("version").toDouble();
- westley = m_document.elementsByTagName("westley").at(0);
-
- QString profilePath = infoXml.attribute("profile");
- QString projectFolderPath = infoXml.attribute("projectfolder");
- if (!projectFolderPath.isEmpty()) m_projectFolder = KUrl(projectFolderPath);
- if (m_projectFolder.isEmpty()) m_projectFolder = KUrl(KdenliveSettings::defaultprojectfolder());
- m_startPos = infoXml.attribute("position").toInt();
- m_zoom = infoXml.attribute("zoom", "7").toInt();
- setProfilePath(profilePath);
-
- // 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");
- const int max = producers.count();
- const int infomax = infoproducers.count();
-
- if (max > 0) {
- m_documentLoadingStep = 100.0 / (max + infomax + 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();
- }
- QString prodId = e.attribute("id");
- if (!e.isNull() && prodId != "black" && !prodId.startsWith("slowmotion")/*&& prodId.toInt() > 0*/) {
- // addClip(e, prodId, false);
- kDebug() << "// PROD: " << prodId;
- }
- }
-
- for (int i = 0; i < infomax; i++) {
- e = infoproducers.item(i).cloneNode().toElement();
- if (m_documentLoadingStep > 0) {
- m_documentLoadingProgress += m_documentLoadingStep;
- parent->slotGotProgressInfo(QString(), (int) m_documentLoadingProgress);
- //qApp->processEvents();
- }
- QString prodId = e.attribute("id");
- if (!e.isNull() && prodId != "black" && !prodId.startsWith("slowmotion")) {
- e.setTagName("producer");
- addClipInfo(e, prodId);
- kDebug() << "// NLIVE PROD: " << prodId;
- }
- }
+ if (!convertDocument(version)) {
+ KMessageBox::sorry(parent, i18n("This project type is unsupported and can't be loaded."), i18n("Unable to open project"));
+ m_document = createEmptyDocument(tracks.x(), tracks.y());
+ setProfilePath(profileName);
+ } else {
+ /*
+ * read again <kdenlivedoc> and <westley> to get all the new
+ * stuff (convertDocument() can now do anything without breaking
+ * document loading)
+ */
+ infoXmlNode = m_document.elementsByTagName("kdenlivedoc").at(0);
+ infoXml = infoXmlNode.toElement();
+ version = infoXml.attribute("version").toDouble();
+ westley = m_document.elementsByTagName("westley").at(0);
+
+ QString profilePath = infoXml.attribute("profile");
+ QString projectFolderPath = infoXml.attribute("projectfolder");
+ if (!projectFolderPath.isEmpty()) m_projectFolder = KUrl(projectFolderPath);
+ if (m_projectFolder.isEmpty()) m_projectFolder = KUrl(KdenliveSettings::defaultprojectfolder());
+ m_startPos = infoXml.attribute("position").toInt();
+ m_zoom = infoXml.attribute("zoom", "7").toInt();
+ setProfilePath(profilePath);
+
+ // 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");
+ const int max = producers.count();
+ const int infomax = infoproducers.count();
+
+ if (max > 0) {
+ m_documentLoadingStep = 100.0 / (max + infomax + 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();
+ }
+ QString prodId = e.attribute("id");
+ if (!e.isNull() && prodId != "black" && !prodId.startsWith("slowmotion")/*&& prodId.toInt() > 0*/) {
+ // addClip(e, prodId, false);
+ kDebug() << "// PROD: " << prodId;
+ }
+ }
+
+ for (int i = 0; i < infomax; i++) {
+ e = infoproducers.item(i).cloneNode().toElement();
+ if (m_documentLoadingStep > 0) {
+ m_documentLoadingProgress += m_documentLoadingStep;
+ parent->slotGotProgressInfo(QString(), (int) m_documentLoadingProgress);
+ //qApp->processEvents();
+ }
+ QString prodId = e.attribute("id");
+ if (!e.isNull() && prodId != "black" && !prodId.startsWith("slowmotion")) {
+ e.setTagName("producer");
+ addClipInfo(e, prodId);
+ kDebug() << "// NLIVE PROD: " << prodId;
+ }
+ }
+
+ 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") {
+ m_clipManager->getClipById(e.attribute("id"))->addSnapMarker(GenTime(e.attribute("time").toDouble()), e.attribute("comment"));
+ }
+ }
+ westley.removeChild(markers);
+ }
+ m_document.removeChild(infoXmlNode);
- 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") {
- m_clipManager->getClipById(e.attribute("id"))->addSnapMarker(GenTime(e.attribute("time").toDouble()), e.attribute("comment"));
- }
- }
- westley.removeChild(markers);
- }
- m_document.removeChild(infoXmlNode);
-
- kDebug() << "Reading file: " << url.path() << ", found clips: " << producers.count();
+ kDebug() << "Reading file: " << url.path() << ", found clips: " << producers.count();
+ }
} else {
parent->slotGotProgressInfo(i18n("File %1 is not a Kdenlive project file."), 100);
kWarning() << " NO KDENLIVE INFO FOUND IN FILE: " << url.path();
@@ -328,8 +333,16 @@
return m_zoom;
}
-void KdenliveDoc::convertDocument(double version) {
+bool KdenliveDoc::convertDocument(double version) {
kDebug() << "Opening a document with version " << version;
+
+ // Opening a old Kdenlive document
+ if (version == 0.5 || version == 0.7) {
+ 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
QString tracksOrder;
@@ -347,14 +360,7 @@
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;
+ return TRUE;
}
QDomNode westley = m_document.elementsByTagName("westley").at(1);
@@ -819,6 +825,8 @@
}
*/
//kDebug() << "///////////////// END CONVERTED DOC:";
+
+ return TRUE;
}
QString KdenliveDoc::colorToString(const QColor& c) {
Only in kdenlive/src: kdenlivedoc.cpp.orig
diff -ru kdenlive.orig/src/kdenlivedoc.h kdenlive/src/kdenlivedoc.h
--- kdenlive.orig/src/kdenlivedoc.h 2008-12-18 01:30:04.000000000 +0100
+++ kdenlive/src/kdenlivedoc.h 2008-12-18 01:02:32.000000000 +0100
@@ -146,7 +146,7 @@
QList <TrackInfo> m_tracksList;
- void convertDocument(double version);
+ bool convertDocument(double version);
QDomDocument createEmptyDocument(const int videotracks, const int audiotracks);
QString colorToString(const QColor& c);
void checkProjectClips();
Only in kdenlive/src: kdenlivedoc.h.orig
|
Kdenlive bug tracker
Home page
Relationships 
Relationships 