* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
-#include <QCryptographicHash>
-#include <QFile>
+
+#include "kdenlivedoc.h"
+#include "docclipbase.h"
+#include "profilesdialog.h"
+#include "kdenlivesettings.h"
+#include "renderer.h"
+#include "clipmanager.h"
+#include "titlewidget.h"
+#include "mainwindow.h"
#include <KDebug>
#include <KStandardDirs>
#include <KIO/CopyJob>
#include <KApplication>
+#include <QCryptographicHash>
+#include <QFile>
#include <mlt++/Mlt.h>
-#include "kdenlivedoc.h"
-#include "docclipbase.h"
-#include "profilesdialog.h"
-#include "kdenlivesettings.h"
-#include "renderer.h"
-#include "clipmanager.h"
-#include "addfoldercommand.h"
-#include "editfoldercommand.h"
-#include "titlewidget.h"
-#include "mainwindow.h"
-KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup *undoGroup, const QString &profileName, const QPoint tracks, Render *render, MainWindow *parent): QObject(parent), m_render(render), 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_zoneStart(0), m_zoneEnd(100) {
+KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup *undoGroup, const QString &profileName, const QPoint tracks, Render *render, MainWindow *parent) :
+ QObject(parent),
+ m_autosave(NULL),
+ m_url(url),
+ m_zoom(7),
+ m_startPos(0),
+ m_render(render),
+ m_commandStack(new QUndoStack(undoGroup)),
+ m_modified(false),
+ m_projectFolder(projectFolder),
+ m_documentLoadingStep(0.0),
+ m_documentLoadingProgress(0),
+ m_abortLoading(false),
+ m_zoneStart(0),
+ m_zoneEnd(100)
+{
m_clipManager = new ClipManager(this);
m_autoSaveTimer = new QTimer(this);
m_autoSaveTimer->setSingleShot(true);
if (!url.isEmpty()) {
QString tmpFile;
- if (KIO::NetAccess::download(url.path(), tmpFile, parent)) {
+ bool success = KIO::NetAccess::download(url.path(), tmpFile, parent);
+ if (success) {
QFile file(tmpFile);
- m_document.setContent(&file, false);
+ QString errorMsg;
+ success = m_document.setContent(&file, false, &errorMsg);
file.close();
+ if (success == false) {
+ // File is corrupted, warn user
+ KMessageBox::error(parent, errorMsg);
+ }
+ } else KMessageBox::error(parent, KIO::NetAccess::lastErrorString());
+
+ if (success) {
QDomNode infoXmlNode = m_document.elementsByTagName("kdenlivedoc").at(0);
QDomNode westley = m_document.elementsByTagName("westley").at(0);
if (!infoXmlNode.isNull()) {
// Upgrade old Kdenlive documents to current version
if (!convertDocument(version)) {
- KMessageBox::sorry(parent, i18n("This project type is unsupported and can't be loaded."), i18n("Unable to open project"));
+ m_url.clear();
m_document = createEmptyDocument(tracks.x(), tracks.y());
setProfilePath(profileName);
} else {
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());
+
+ if (m_projectFolder.isEmpty() || !KIO::NetAccess::exists(m_projectFolder.path(), KIO::NetAccess::DestinationSide, parent)) {
+ // Make sure the project folder is usable
+ KMessageBox::information(parent, i18n("Document project folder is invalid, setting it to the default one: %1", KdenliveSettings::defaultprojectfolder()));
+ m_projectFolder = KUrl(KdenliveSettings::defaultprojectfolder());
+ }
m_startPos = infoXml.attribute("position").toInt();
m_zoom = infoXml.attribute("zoom", "7").toInt();
- m_zoneStart = infoXml.attribute("zonein", "0").toInt();
m_zoneEnd = infoXml.attribute("zoneout", "100").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;
+ QDomNode tracksinfo = m_document.elementsByTagName("tracksinfo").at(0);
+ TrackInfo projectTrack;
+ if (!tracksinfo.isNull()) {
+ QDomNodeList trackslist = tracksinfo.childNodes();
+ int maxchild = trackslist.count();
+ for (int k = 0; k < maxchild; k++) {
+ e = trackslist.at(k).toElement();
+ if (e.tagName() == "trackinfo") {
+ if (e.attribute("type") == "audio") projectTrack.type = AUDIOTRACK;
+ else projectTrack.type = VIDEOTRACK;
+ projectTrack.isMute = e.attribute("mute").toInt();
+ projectTrack.isBlind = e.attribute("blind").toInt();
+ projectTrack.isLocked = e.attribute("locked").toInt();
+ m_tracksList.append(projectTrack);
+ }
+ }
+ westley.removeChild(tracksinfo);
}
-
- QDomElement e;
- QDomElement orig;
QDomNodeList producers = m_document.elementsByTagName("producer");
QDomNodeList infoproducers = m_document.elementsByTagName("kdenlive_producer");
const int max = producers.count();
const int infomax = infoproducers.count();
+ QDomNodeList folders = m_document.elementsByTagName("folder");
+ for (int i = 0; i < folders.count(); i++) {
+ e = folders.item(i).cloneNode().toElement();
+ m_clipManager->addFolder(e.attribute("id"), e.attribute("name"));
+ }
+
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 < infomax; i++) {
+ for (int i = 0; i < infomax && !m_abortLoading; i++) {
e = infoproducers.item(i).cloneNode().toElement();
if (m_documentLoadingStep > 0) {
m_documentLoadingProgress += m_documentLoadingStep;
//qApp->processEvents();
}
QString prodId = e.attribute("id");
- if (!e.isNull() && prodId != "black" && !prodId.startsWith("slowmotion")) {
+ if (!e.isNull() && prodId != "black" && !prodId.startsWith("slowmotion") && !m_abortLoading) {
e.setTagName("producer");
// Get MLT's original producer properties
-
+ QDomElement orig;
for (int j = 0; j < max; j++) {
QDomElement o = producers.item(j).cloneNode().toElement();
QString origId = o.attribute("id").section('_', 0, 0);
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"));
+ if (m_abortLoading) {
+ //parent->slotGotProgressInfo(i18n("File %1 is not a Kdenlive project file."), 100);
+ emit resetProjectList();
+ m_startPos = 0;
+ m_url = KUrl();
+ m_tracksList.clear();
+ kWarning() << "Aborted loading of: " << url.path();
+ m_document = createEmptyDocument(KdenliveSettings::videotracks(), KdenliveSettings::audiotracks());
+ setProfilePath(KdenliveSettings::default_profile());
+ m_clipManager->clear();
+ } else {
+ 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);
}
- westley.removeChild(markers);
+ m_document.removeChild(infoXmlNode);
+ kDebug() << "Reading file: " << url.path() << ", found clips: " << producers.count();
}
- m_document.removeChild(infoXmlNode);
-
- 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();
- m_document = createEmptyDocument(tracks.x(), tracks.y());
- setProfilePath(profileName);
+ m_document = createEmptyDocument(KdenliveSettings::videotracks(), KdenliveSettings::audiotracks());
+ m_url = KUrl();
+ setProfilePath(KdenliveSettings::default_profile());
}
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(tracks.x(), tracks.y());
- setProfilePath(profileName);
+ m_url = KUrl();
+ m_document = createEmptyDocument(KdenliveSettings::videotracks(), KdenliveSettings::audiotracks());
+ setProfilePath(KdenliveSettings::default_profile());
}
} else {
m_document = createEmptyDocument(tracks.x(), tracks.y());
KStandardDirs::makeDir(m_projectFolder.path() + "/thumbs/");
KStandardDirs::makeDir(m_projectFolder.path() + "/ladspa/");
- m_scenelist = m_document.toString();
- kDebug() << "KDEnnlive document, init timecode: " << m_fps;
+ kDebug() << "KDEnlive document, init timecode: " << m_fps;
if (m_fps == 30000.0 / 1001.0) m_timecode.setFormat(30, true);
else m_timecode.setFormat((int) m_fps);
}
-KdenliveDoc::~KdenliveDoc() {
+KdenliveDoc::~KdenliveDoc()
+{
delete m_commandStack;
delete m_clipManager;
delete m_autoSaveTimer;
}
}
-void KdenliveDoc::setSceneList() {
+void KdenliveDoc::setSceneList()
+{
m_render->setSceneList(m_document.toString(), m_startPos);
- checkProjectClips();
+ //checkProjectClips();
}
-QDomDocument KdenliveDoc::createEmptyDocument(const int videotracks, const int audiotracks) {
+QDomDocument KdenliveDoc::createEmptyDocument(const int videotracks, const int audiotracks)
+{
// Creating new document
QDomDocument doc;
QDomElement westley = doc.createElement("westley");
videoTrack.type = VIDEOTRACK;
videoTrack.isMute = false;
videoTrack.isBlind = false;
+ videoTrack.isLocked = false;
TrackInfo audioTrack;
audioTrack.type = AUDIOTRACK;
audioTrack.isMute = false;
audioTrack.isBlind = true;
+ audioTrack.isLocked = false;
QDomElement tractor = doc.createElement("tractor");
tractor.setAttribute("id", "maintractor");
}
-void KdenliveDoc::syncGuides(QList <Guide *> guides) {
- QDomDocument doc;
- QDomElement e;
+void KdenliveDoc::syncGuides(QList <Guide *> guides)
+{
m_guidesXml.clear();
- m_guidesXml = doc.createElement("guides");
+ QDomElement guideNode = m_guidesXml.createElement("guides");
+ m_guidesXml.appendChild(guideNode);
+ QDomElement e;
for (int i = 0; i < guides.count(); i++) {
- e = doc.createElement("guide");
+ e = m_guidesXml.createElement("guide");
e.setAttribute("time", guides.at(i)->position().ms() / 1000);
e.setAttribute("comment", guides.at(i)->label());
- m_guidesXml.appendChild(e);
+ guideNode.appendChild(e);
}
emit guidesUpdated();
}
-QDomElement KdenliveDoc::guidesXml() const {
- return m_guidesXml;
+QDomElement KdenliveDoc::guidesXml() const
+{
+ return m_guidesXml.documentElement();
}
-void KdenliveDoc::slotAutoSave() {
+void KdenliveDoc::slotAutoSave()
+{
if (m_render && m_autosave) {
if (!m_autosave->isOpen() && !m_autosave->open(QIODevice::ReadWrite)) {
// show error: could not open the autosave file
kDebug() << "ERROR; CANNOT CREATE AUTOSAVE FILE";
}
kDebug() << "// AUTOSAVE FILE: " << m_autosave->fileName();
- QDomDocument doc;
+ QString doc;
if (KdenliveSettings::dropbframes()) {
KdenliveSettings::setDropbframes(false);
m_clipManager->updatePreviewSettings();
- doc.setContent(m_render->sceneList());
+ doc = m_render->sceneList();
KdenliveSettings::setDropbframes(true);
m_clipManager->updatePreviewSettings();
- } else doc.setContent(m_render->sceneList());
+ } else doc = m_render->sceneList();
saveSceneList(m_autosave->fileName(), doc);
}
}
-void KdenliveDoc::setZoom(int factor) {
+void KdenliveDoc::setZoom(int factor)
+{
m_zoom = factor;
}
-int KdenliveDoc::zoom() const {
+int KdenliveDoc::zoom() const
+{
return m_zoom;
}
-bool KdenliveDoc::convertDocument(double version) {
+bool KdenliveDoc::convertDocument(double version)
+{
kDebug() << "Opening a document with version " << version;
+ const double current_version = 0.82;
- if (version == 0.81) return true;
+ if (version == current_version) return true;
+
+ if (version > current_version) {
+ kDebug() << "Unable to open document with version " << version;
+ KMessageBox::sorry(kapp->activeWindow(), i18n("This project type is unsupported (version %1) and can't be loaded.\nPlease consider upgrading you Kdenlive version.", version), i18n("Unable to open project"));
+ return false;
+ }
// Opening a old Kdenlive document
- if (version == 0.5 || version == 0.7 || version > 0.81) {
+ if (version == 0.5 || version == 0.7) {
+ KMessageBox::sorry(kapp->activeWindow(), i18n("This project type is unsupported (version %1) and can't be loaded.", version), i18n("Unable to open project"));
kDebug() << "Unable to open document with version " << version;
// TODO: convert 0.7 (0.5?) files to the new document format.
- return FALSE;
+ return false;
+ }
+
+ setModified(true);
+
+ if (version == 0.81) {
+ // Add correct tracks info
+ QDomNode kdenlivedoc = m_document.elementsByTagName("kdenlivedoc").at(0);
+ QDomElement infoXml = kdenlivedoc.toElement();
+ infoXml.setAttribute("version", current_version);
+ QString currentTrackOrder = infoXml.attribute("tracks");
+ QDomElement tracksinfo = m_document.createElement("tracksinfo");
+ for (int i = 0; i < currentTrackOrder.size(); i++) {
+ QDomElement trackinfo = m_document.createElement("trackinfo");
+ if (currentTrackOrder.data()[i] == 'a') {
+ trackinfo.setAttribute("type", "audio");
+ trackinfo.setAttribute("blind", true);
+ } else trackinfo.setAttribute("blind", false);
+ trackinfo.setAttribute("mute", false);
+ trackinfo.setAttribute("locked", false);
+ tracksinfo.appendChild(trackinfo);
+ }
+ infoXml.appendChild(tracksinfo);
+ return true;
}
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 if (t.attribute("producer") != "black_track")
- 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);
+ infoXml.setAttribute("version", current_version);
+ QDomElement tracksinfo = m_document.createElement("tracksinfo");
- return TRUE;
+ for (int i = 0; i < max; i++) {
+ QDomElement trackinfo = m_document.createElement("trackinfo");
+ QDomElement t = tracks.at(i).toElement();
+ if (t.attribute("hide") == "video") {
+ trackinfo.setAttribute("type", "audio");
+ trackinfo.setAttribute("blind", true);
+ } else trackinfo.setAttribute("blind", false);
+ trackinfo.setAttribute("mute", false);
+ trackinfo.setAttribute("locked", false);
+ if (t.attribute("producer") != "black_track") tracksinfo.appendChild(trackinfo);
+ }
+ infoXml.appendChild(tracksinfo);
+ return true;
}
QDomNode westley = m_document.elementsByTagName("westley").at(1);
QDomNode tractor = m_document.elementsByTagName("tractor").at(0);
QDomNode kdenlivedoc = m_document.elementsByTagName("kdenlivedoc").at(0);
QDomElement kdenlivedoc_old = kdenlivedoc.cloneNode(true).toElement(); // Needed for folders
+ QDomElement infoXml = kdenlivedoc.toElement();
+ infoXml.setAttribute("version", current_version);
QDomNode multitrack = m_document.elementsByTagName("multitrack").at(0);
QDomNodeList playlists = m_document.elementsByTagName("playlist");
// 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);
+ if (westley.isNull()) {
+ westley = m_document.createElement("westley");
+ m_document.documentElement().appendChild(westley);
+ }
+ if (tractor.isNull()) {
+ kDebug() << "// NO WESTLEY PLAYLIST, building empty one";
+ QDomElement blank_tractor = m_document.createElement("tractor");
+ westley.appendChild(blank_tractor);
+ QDomElement blank_playlist = m_document.createElement("playlist");
+ blank_playlist.setAttribute("id", "black_track");
+ westley.insertBefore(blank_playlist, QDomNode());
+ QDomElement blank_track = m_document.createElement("track");
+ blank_track.setAttribute("producer", "black_track");
+ blank_tractor.appendChild(blank_track);
+
+ QDomNodeList kdenlivetracks = m_document.elementsByTagName("kdenlivetrack");
+ for (int i = 0; i < kdenlivetracks.count(); i++) {
+ blank_playlist = m_document.createElement("playlist");
+ blank_playlist.setAttribute("id", "playlist" + QString::number(i));
+ westley.insertBefore(blank_playlist, QDomNode());
+ blank_track = m_document.createElement("track");
+ blank_track.setAttribute("producer", "playlist" + QString::number(i));
+ blank_tractor.appendChild(blank_track);
+ if (kdenlivetracks.at(i).toElement().attribute("cliptype") == "Sound") {
+ blank_playlist.setAttribute("hide", "video");
+ blank_track.setAttribute("hide", "video");
+ }
}
- track.setAttribute("producer", playlist_id);
- //tractor.appendChild(track);
+ } else 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);
#define KEEP_TRACK_ORDER 1
#ifdef KEEP_TRACK_ORDER
- tractor.insertAfter(track, QDomNode());
+ tractor.insertAfter(track, QDomNode());
#else
- // Insert the new track in an order that hopefully matches the 3 video, then 2 audio tracks of Kdenlive 0.7.0
- // insertion sort - O( tracks*tracks )
- // Note, this breaks _all_ transitions - but you can move them up and down afterwards.
- QDomElement tractor_elem = tractor.toElement();
- if (! tractor_elem.isNull()) {
- QDomNodeList tracks = tractor_elem.elementsByTagName("track");
- int size = tracks.size();
- if (size == 0) {
- tractor.insertAfter(track, QDomNode());
- } else {
- bool inserted = false;
- for (int i = 0; i < size; ++i) {
- QDomElement track_elem = tracks.at(i).toElement();
- if (track_elem.isNull()) {
- tractor.insertAfter(track, QDomNode());
- inserted = true;
- break;
- } else {
- kDebug() << "playlist_id: " << playlist_id << " producer:" << track_elem.attribute("producer");
- if (playlist_id < track_elem.attribute("producer")) {
- tractor.insertBefore(track, track_elem);
+ // Insert the new track in an order that hopefully matches the 3 video, then 2 audio tracks of Kdenlive 0.7.0
+ // insertion sort - O( tracks*tracks )
+ // Note, this breaks _all_ transitions - but you can move them up and down afterwards.
+ QDomElement tractor_elem = tractor.toElement();
+ if (! tractor_elem.isNull()) {
+ QDomNodeList tracks = tractor_elem.elementsByTagName("track");
+ int size = tracks.size();
+ if (size == 0) {
+ tractor.insertAfter(track, QDomNode());
+ } else {
+ bool inserted = false;
+ for (int i = 0; i < size; ++i) {
+ QDomElement track_elem = tracks.at(i).toElement();
+ if (track_elem.isNull()) {
+ tractor.insertAfter(track, QDomNode());
inserted = true;
break;
+ } else {
+ kDebug() << "playlist_id: " << playlist_id << " producer:" << track_elem.attribute("producer");
+ if (playlist_id < track_elem.attribute("producer")) {
+ tractor.insertBefore(track, track_elem);
+ inserted = true;
+ break;
+ }
}
}
+ // Reach here, no insertion, insert last
+ if (!inserted) {
+ tractor.insertAfter(track, QDomNode());
+ }
}
- // Reach here, no insertion, insert last
- if (!inserted) {
- tractor.insertAfter(track, QDomNode());
- }
+ } else {
+ kWarning() << "tractor was not a QDomElement";
+ tractor.insertAfter(track, QDomNode());
}
- } else {
- kWarning() << "tractor was not a QDomElement";
- tractor.insertAfter(track, QDomNode());
- }
#endif
- }
+ }
tractor.removeChild(multitrack);
- // write tracks order now that they've been sorted
- QString tracksOrder;
- QDomNodeList tracks = m_document.elementsByTagName("track");
- for (int i = 0; i < tracks.count(); ++i) {
- QDomElement track = tracks.at(i).toElement();
- if (track.attribute("hide") == "video")
- tracksOrder.append('a');
- else if (track.attribute("producer") != "black_track")
- tracksOrder.append('v');
- }
-
// audio track mixing transitions should not be added to track view, so add required attribute
QDomNodeList transitions = m_document.elementsByTagName("transition");
max = transitions.count();
QDomText value = m_document.createTextNode("237");
property.appendChild(value);
tr.appendChild(property);
+ property = m_document.createElement("property");
+ property.setAttribute("name", "mlt_service");
+ value = m_document.createTextNode("mix");
+ property.appendChild(value);
+ tr.appendChild(property);
} else {
// convert transition
QDomNamedNodeMap attrs = tr.attributes();
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()) {
+ /*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 tracks info
+ QDomNodeList tracks = m_document.elementsByTagName("track");
+ max = tracks.count();
+ QDomElement tracksinfo = m_document.createElement("tracksinfo");
+ for (int i = 0; i < max; i++) {
+ QDomElement trackinfo = m_document.createElement("trackinfo");
+ QDomElement t = tracks.at(i).toElement();
+ if (t.attribute("hide") == "video") {
+ trackinfo.setAttribute("type", "audio");
+ trackinfo.setAttribute("blind", true);
+ } else trackinfo.setAttribute("blind", false);
+ trackinfo.setAttribute("mute", false);
+ trackinfo.setAttribute("locked", false);
+ if (t.attribute("producer") != "black_track") tracksinfo.appendChild(trackinfo);
+ }
+ kdenlivedoc_new.appendChild(tracksinfo);
+
// Add all the producers that has a ressource in westley
QDomElement westley_element = westley0.toElement();
if (westley_element.isNull()) {
QDomElement wproducer = wproducers.at(i).toElement();
if (wproducer.isNull()) {
kWarning() << "Found producer in westley0, that was not a QDomElement";
+ continue;
+ }
+ if (wproducer.attribute("id") == "black") continue;
+ // We have to do slightly different things, depending on the 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
} else {
- // We have to do slightly different things, depending on the 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
- } else {
- QDomElement kproducer = m_document.createElement("kdenlive_producer");
- kproducer.setAttribute("id", wproducer.attribute("id"));
- 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);
+ QDomElement kproducer = m_document.createElement("kdenlive_producer");
+ kproducer.setAttribute("id", wproducer.attribute("id"));
+ 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("id").toInt() > max_kproducer_id) {
- max_kproducer_id = wproducer.attribute("id").toInt();
+ if (!wproducer.attribute("length").isEmpty()) {
+ kproducer.setAttribute("duration", wproducer.attribute("length"));
}
+ kdenlivedoc_new.appendChild(kproducer);
+ }
+ if (wproducer.attribute("id").toInt() > max_kproducer_id) {
+ max_kproducer_id = wproducer.attribute("id").toInt();
}
}
}
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();
+ QDomElement kproducer;
if (avfile.isNull())
kWarning() << "found an <avfile /> that is not a QDomElement";
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("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();
- /*
- QFile file( "converted.kdenlive" );
- if ( file.open( QIODevice::WriteOnly ) ) {
- QTextStream stream( &file );
- stream << m_document.toString();
- file.close();
+ /*kDebug() << "///////////////// CONVERTED DOC:";
+ kDebug() << m_document.toString();
+ kDebug() << "///////////////// END CONVERTED DOC:";
+
+ QFile file("converted.kdenlive");
+ if (file.open(QIODevice::WriteOnly)) {
+ QTextStream stream(&file);
+ stream << m_document.toString().toUtf8();
+ file.close();
} else {
- kDebug() << "Unable to dump file to converted.kdenlive";
- }
- */
+ kDebug() << "Unable to dump file to converted.kdenlive";
+ }*/
+
//kDebug() << "///////////////// END CONVERTED DOC:";
- return TRUE;
+ return true;
}
-QString KdenliveDoc::colorToString(const QColor& c) {
+QString KdenliveDoc::colorToString(const QColor& c)
+{
QString ret = "%1,%2,%3,%4";
ret = ret.arg(c.red()).arg(c.green()).arg(c.blue()).arg(c.alpha());
return ret;
}
-void KdenliveDoc::setZone(int start, int end) {
+void KdenliveDoc::setZone(int start, int end)
+{
m_zoneStart = start;
m_zoneEnd = end;
}
-QPoint KdenliveDoc::zone() const {
+QPoint KdenliveDoc::zone() const
+{
return QPoint(m_zoneStart, m_zoneEnd);
}
-bool KdenliveDoc::saveSceneList(const QString &path, QDomDocument sceneList) {
+bool KdenliveDoc::saveSceneList(const QString &path, const QString &scene)
+{
+ QDomDocument sceneList;
+ sceneList.setContent(scene, true);
QDomNode wes = sceneList.elementsByTagName("westley").at(0);
-
QDomElement addedXml = sceneList.createElement("kdenlivedoc");
+ wes.appendChild(addedXml);
+
QDomElement markers = sceneList.createElement("markers");
- addedXml.setAttribute("version", "0.81");
+ addedXml.setAttribute("version", "0.82");
addedXml.setAttribute("profile", profilePath());
addedXml.setAttribute("position", m_render->seekPosition().frames(m_fps));
addedXml.setAttribute("zonein", m_zoneStart);
addedXml.setAttribute("zoneout", m_zoneEnd);
addedXml.setAttribute("projectfolder", m_projectFolder.path());
- addedXml.setAttribute("tracks", getTracksInfo());
addedXml.setAttribute("zoom", m_zoom);
+ // tracks info
+ QDomElement tracksinfo = sceneList.createElement("tracksinfo");
+ foreach(const TrackInfo &info, m_tracksList) {
+ QDomElement trackinfo = sceneList.createElement("trackinfo");
+ if (info.type == AUDIOTRACK) trackinfo.setAttribute("type", "audio");
+ trackinfo.setAttribute("mute", info.isMute);
+ trackinfo.setAttribute("blind", info.isBlind);
+ trackinfo.setAttribute("locked", info.isLocked);
+ tracksinfo.appendChild(trackinfo);
+ }
+ addedXml.appendChild(tracksinfo);
+
+ // save project folders
+ QMap <QString, QString> folderlist = m_clipManager->documentFolderList();
+
+ QMapIterator<QString, QString> f(folderlist);
+ while (f.hasNext()) {
+ f.next();
+ QDomElement folder = sceneList.createElement("folder");
+ folder.setAttribute("id", f.key());
+ folder.setAttribute("name", f.value());
+ addedXml.appendChild(folder);
+ }
+
+ // Save project clips
QDomElement e;
QList <DocClipBase*> list = m_clipManager->documentClipList();
for (int i = 0; i < list.count(); i++) {
}
}
addedXml.appendChild(markers);
- if (!m_guidesXml.isNull()) addedXml.appendChild(sceneList.importNode(m_guidesXml, true));
- wes.appendChild(addedXml);
+ // Add guides
+ if (!m_guidesXml.isNull()) addedXml.appendChild(sceneList.importNode(m_guidesXml.documentElement(), true));
+
+ // Add clip groups
+ addedXml.appendChild(sceneList.importNode(m_clipManager->groupsXml(), true));
+
//wes.appendChild(doc.importNode(kdenliveData, true));
QFile file(path);
KMessageBox::error(kapp->activeWindow(), i18n("Cannot write to file %1", path));
return false;
}
- QTextStream out(&file);
- out << sceneList.toString();
+
+ file.write(sceneList.toString().toUtf8());
+ if (file.error() != QFile::NoError) {
+ KMessageBox::error(kapp->activeWindow(), i18n("Cannot write to file %1", path));
+ file.close();
+ return false;
+ }
file.close();
return true;
}
-ClipManager *KdenliveDoc::clipManager() {
+ClipManager *KdenliveDoc::clipManager()
+{
return m_clipManager;
}
-KUrl KdenliveDoc::projectFolder() const {
+KUrl KdenliveDoc::projectFolder() const
+{
//if (m_projectFolder.isEmpty()) return KUrl(KStandardDirs::locateLocal("appdata", "/projects/"));
return m_projectFolder;
}
-void KdenliveDoc::setProjectFolder(KUrl url) {
+void KdenliveDoc::setProjectFolder(KUrl url)
+{
if (url == m_projectFolder) return;
setModified(true);
KStandardDirs::makeDir(url.path());
KStandardDirs::makeDir(url.path() + "/titles/");
KStandardDirs::makeDir(url.path() + "/thumbs/");
- if (KMessageBox::questionYesNo(kapp->activeWindow(), i18n("You have changed the project folder. Do you want to copy the cached data from %1 to the new folder %2 ?").arg(m_projectFolder.path(), url.path())) == KMessageBox::Yes) moveProjectData(url);
+ if (KMessageBox::questionYesNo(kapp->activeWindow(), i18n("You have changed the project folder. Do you want to copy the cached data from %1 to the new folder %2?").arg(m_projectFolder.path(), url.path())) == KMessageBox::Yes) moveProjectData(url);
m_projectFolder = url;
}
-void KdenliveDoc::moveProjectData(KUrl url) {
+void KdenliveDoc::moveProjectData(KUrl url)
+{
QList <DocClipBase*> list = m_clipManager->documentClipList();
//TODO: Also move ladspa effects files
for (int i = 0; i < list.count(); i++) {
}
}
-QString KdenliveDoc::profilePath() const {
+const QString &KdenliveDoc::profilePath() const
+{
return m_profile.path;
}
-MltVideoProfile KdenliveDoc::mltProfile() const {
+MltVideoProfile KdenliveDoc::mltProfile() const
+{
return m_profile;
}
-void KdenliveDoc::setProfilePath(QString path) {
+void KdenliveDoc::setProfilePath(QString 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;
+ KdenliveSettings::setProject_fps(m_fps);
m_width = m_profile.width;
m_height = m_profile.height;
kDebug() << "KDEnnlive document, init timecode from path: " << path << ", " << m_fps;
else m_timecode.setFormat((int) m_fps);
}
-const double KdenliveDoc::dar() {
+double KdenliveDoc::dar()
+{
return (double) m_profile.display_aspect_num / m_profile.display_aspect_den;
}
-void KdenliveDoc::setThumbsProgress(const QString &message, int progress) {
+void KdenliveDoc::setThumbsProgress(const QString &message, int progress)
+{
emit progressInfo(message, progress);
}
-void KdenliveDoc::loadingProgressed() {
+void KdenliveDoc::loadingProgressed()
+{
m_documentLoadingProgress += m_documentLoadingStep;
emit progressInfo(QString(), (int) m_documentLoadingProgress);
}
-QUndoStack *KdenliveDoc::commandStack() {
+QUndoStack *KdenliveDoc::commandStack()
+{
return m_commandStack;
}
emit progressInfo(QString(), -1);
}*/
-void KdenliveDoc::checkProjectClips() {
+void KdenliveDoc::checkProjectClips()
+{
if (m_render == NULL) return;
+ m_clipManager->resetProducersList(m_render->producersList());
+ return;
+
+ // Useless now...
QList <Mlt::Producer *> prods = m_render->producersList();
QString id ;
QString prodId ;
if (clip) clip->setProducer(prods.at(i));
if (clip && clip->clipType() == TEXT && !QFile::exists(clip->fileURL().path())) {
// regenerate text clip image if required
- kDebug() << "// TITLE: " << clip->getProperty("titlename") << " Preview file: " << clip->getProperty("resource") << " DOES NOT EXIST";
- QString titlename = clip->getProperty("titlename");
+ //kDebug() << "// TITLE: " << clip->getProperty("titlename") << " Preview file: " << clip->getProperty("resource") << " DOES NOT EXIST";
+ QString titlename = clip->getProperty("name");
QString titleresource;
if (titlename.isEmpty()) {
QStringList titleInfo = TitleWidget::getFreeTitleInfo(projectFolder());
titlename = titleInfo.at(0);
titleresource = titleInfo.at(1);
- clip->setProperty("titlename", titlename);
+ clip->setProperty("name", titlename);
kDebug() << "// New title set to: " << titlename;
} else {
- titleresource = TitleWidget::getTitleResourceFromName(projectFolder(), titlename);
+ titleresource = TitleWidget::getFreeTitleInfo(projectFolder()).at(1);
+ //titleresource = TitleWidget::getTitleResourceFromName(projectFolder(), titlename);
}
- QString titlepath = projectFolder().path() + "/titles/";
- TitleWidget *dia_ui = new TitleWidget(KUrl(), titlepath, m_render, kapp->activeWindow());
+ TitleWidget *dia_ui = new TitleWidget(KUrl(), KUrl(titleresource).directory(), m_render, kapp->activeWindow());
QDomDocument doc;
doc.setContent(clip->getProperty("xmldata"));
dia_ui->setXml(doc);
- QPixmap pix = dia_ui->renderedPixmap();
+ QImage pix = dia_ui->renderedPixmap();
pix.save(titleresource);
clip->setProperty("resource", titleresource);
delete dia_ui;
}
}
-void KdenliveDoc::updatePreviewSettings() {
+void KdenliveDoc::updatePreviewSettings()
+{
m_clipManager->updatePreviewSettings();
m_render->updatePreviewSettings();
m_clipManager->resetProducersList(m_render->producersList());
}
-Render *KdenliveDoc::renderer() {
+Render *KdenliveDoc::renderer()
+{
return m_render;
}
-void KdenliveDoc::updateClip(const QString &id) {
+void KdenliveDoc::updateClip(const QString &id)
+{
emit updateClipDisplay(id);
}
-int KdenliveDoc::getFramePos(QString duration) {
+int KdenliveDoc::getFramePos(QString duration)
+{
return m_timecode.getFrameCount(duration, m_fps);
}
-QString KdenliveDoc::producerName(const QString &id) {
+QString KdenliveDoc::producerName(const QString &id)
+{
QString result = "unnamed";
QDomNodeList prods = producersList();
int ct = prods.count();
return result;
}
-void KdenliveDoc::setProducerDuration(const QString &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++) {
}
}
-int KdenliveDoc::getProducerDuration(const QString &id) {
+int KdenliveDoc::getProducerDuration(const QString &id)
+{
int result = 0;
QDomNodeList prods = producersList();
int ct = prods.count();
return result;
}
-
-QDomDocument KdenliveDoc::generateSceneList() {
- QDomDocument doc;
- QDomElement westley = doc.createElement("westley");
- doc.appendChild(westley);
- QDomElement prod = doc.createElement("producer");
-}
-
-QDomDocument KdenliveDoc::toXml() {
+QDomDocument KdenliveDoc::toXml()
+{
return m_document;
}
-Timecode KdenliveDoc::timecode() const {
+Timecode KdenliveDoc::timecode() const
+{
return m_timecode;
}
-QDomNodeList KdenliveDoc::producersList() {
+QDomNodeList KdenliveDoc::producersList()
+{
return m_document.elementsByTagName("producer");
}
-void KdenliveDoc::backupMltPlaylist() {
- if (m_render) m_scenelist = m_render->sceneList();
-}
-
-double KdenliveDoc::projectDuration() const {
- if (m_render) return GenTime(m_render->getLength(), m_fps).ms() / 1000;
+double KdenliveDoc::projectDuration() const
+{
+ if (m_render)
+ return GenTime(m_render->getLength(), m_fps).ms() / 1000;
+ else
+ return 0;
}
-double KdenliveDoc::fps() const {
+double KdenliveDoc::fps() const
+{
return m_fps;
}
-int KdenliveDoc::width() const {
+int KdenliveDoc::width() const
+{
return m_width;
}
-int KdenliveDoc::height() const {
+int KdenliveDoc::height() const
+{
return m_height;
}
-KUrl KdenliveDoc::url() const {
+KUrl KdenliveDoc::url() const
+{
return m_url;
}
-void KdenliveDoc::setUrl(KUrl url) {
+void KdenliveDoc::setUrl(KUrl url)
+{
m_url = url;
}
-void KdenliveDoc::setModified(bool mod) {
+void KdenliveDoc::setModified(bool mod)
+{
if (!m_url.isEmpty() && mod && KdenliveSettings::crashrecovery()) {
m_autoSaveTimer->start(3000);
}
emit docModified(m_modified);
}
-bool KdenliveDoc::isModified() const {
+bool KdenliveDoc::isModified() const
+{
return m_modified;
}
-QString KdenliveDoc::description() const {
+const QString KdenliveDoc::description() const
+{
if (m_url.isEmpty())
return i18n("Untitled") + " / " + m_profile.description;
else
return m_url.fileName() + " / " + m_profile.description;
}
-void KdenliveDoc::addClip(QDomElement elem, QString clipId, bool createClipItem) {
+void KdenliveDoc::addClip(QDomElement elem, QString clipId, bool createClipItem)
+{
const QString producerId = clipId.section('_', 0, 0);
- int subtrack = clipId.section('_', 1, 1).toInt();
DocClipBase *clip = m_clipManager->getClipById(producerId);
if (clip == NULL) {
- /*kDebug()<<"// CLIP "<<clipId<<" NOT OFUND in LIST, CREATING";
- QDomDocument doc;
- doc.appendChild(doc.importNode(elem, true));
- kDebug() << "IMPORTED CLIP: \n" << doc.toString()<<"\n";*/
elem.setAttribute("id", producerId);
QString path = elem.attribute("resource");
QString extension;
if (elem.attribute("type").toInt() == SLIDESHOW) {
extension = KUrl(path).fileName();
path = KUrl(path).directory();
+ } else if (elem.attribute("type").toInt() == TEXT && QFile::exists(path) == false) {
+ kDebug() << "// TITLE: " << elem.attribute("name") << " Preview file: " << elem.attribute("resource") << " DOES NOT EXIST";
+ QString titlename = elem.attribute("name");
+ QString titleresource;
+ if (titlename.isEmpty()) {
+ QStringList titleInfo = TitleWidget::getFreeTitleInfo(projectFolder());
+ titlename = titleInfo.at(0);
+ titleresource = titleInfo.at(1);
+ elem.setAttribute("name", titlename);
+ kDebug() << "// New title set to: " << titlename;
+ } else {
+ titleresource = TitleWidget::getFreeTitleInfo(projectFolder()).at(1);
+ //titleresource = TitleWidget::getTitleResourceFromName(projectFolder(), titlename);
+ }
+ TitleWidget *dia_ui = new TitleWidget(KUrl(), KUrl(titleresource).directory(), m_render, kapp->activeWindow());
+ QDomDocument doc;
+ doc.setContent(elem.attribute("xmldata"));
+ dia_ui->setXml(doc);
+ QImage pix = dia_ui->renderedPixmap();
+ pix.save(titleresource);
+ elem.setAttribute("resource", titleresource);
+ setNewClipResource(clipId, titleresource);
+ delete dia_ui;
}
- if (!path.isEmpty() && !QFile::exists(path)) {
+ if (path.isEmpty() == false && QFile::exists(path) == false && elem.attribute("type").toInt() != TEXT) {
+ kDebug() << "// FOUND MISSING CLIP: " << path << ", TYPE: " << elem.attribute("type").toInt();
const QString size = elem.attribute("file_size");
const QString hash = elem.attribute("file_hash");
QString newpath;
- KMessageBox::ButtonCode action = KMessageBox::No;
+ int action = KMessageBox::No;
if (!size.isEmpty() && !hash.isEmpty()) {
if (!m_searchFolder.isEmpty()) newpath = searchFileRecursively(m_searchFolder, size, hash);
- else action = (KMessageBox::ButtonCode)KMessageBox::messageBox(kapp->activeWindow(), KMessageBox::WarningYesNo, i18n("Clip <b>%1</b><br>is invalid, what do you want to do?", path), i18n("File not found"), KGuiItem(i18n("Search automatically")), /*KGuiItem(i18n("Remove from project")), */KGuiItem(i18n("Keep as placeholder")));
+ else action = (KMessageBox::ButtonCode) KMessageBox::questionYesNoCancel(kapp->activeWindow(), i18n("Clip <b>%1</b><br>is invalid, what do you want to do?", path), i18n("File not found"), KGuiItem(i18n("Search automatically")), KGuiItem(i18n("Keep as placeholder")));
} else {
if (elem.attribute("type").toInt() == SLIDESHOW) {
- if (KMessageBox::messageBox(kapp->activeWindow(), KMessageBox::WarningYesNo, i18n("<qt>Clip <b>%1</b><br>is invalid or missing, what do you want to do?", path), i18n("File not found"), KGuiItem(i18n("Search manually")), /*KGuiItem(i18n("Remove from project")),*/ KGuiItem(i18n("Keep as placeholder"))) == KMessageBox::Yes)
+ int res = KMessageBox::questionYesNoCancel(kapp->activeWindow(), i18n("Clip <b>%1</b><br>is invalid or missing, what do you want to do?", path), i18n("File not found"), KGuiItem(i18n("Search manually")), KGuiItem(i18n("Keep as placeholder")));
+ if (res == KMessageBox::Yes)
newpath = KFileDialog::getExistingDirectory(KUrl("kfiledialog:///clipfolder"), kapp->activeWindow(), i18n("Looking for %1", path));
- } else if (KMessageBox::messageBox(kapp->activeWindow(), KMessageBox::WarningYesNo, i18n("Clip <b>%1</b><br>is invalid or missing, what do you want to do?", path), i18n("File not found"), KGuiItem(i18n("Search manually")), /*KGuiItem(i18n("Remove from project")),*/ KGuiItem(i18n("Keep as placeholder"))) == KMessageBox::Yes)
- newpath = KFileDialog::getOpenFileName(KUrl("kfiledialog:///clipfolder"), QString(), kapp->activeWindow(), i18n("Looking for %1", path));
+ else if (res == KMessageBox::Cancel) {
+ // Abort project loading
+ action = KMessageBox::Cancel;
+ }
+ } else {
+ int res = KMessageBox::questionYesNoCancel(kapp->activeWindow(), i18n("Clip <b>%1</b><br>is invalid or missing, what do you want to do?", path), i18n("File not found"), KGuiItem(i18n("Search manually")), KGuiItem(i18n("Keep as placeholder")));
+ if (res == KMessageBox::Yes)
+ newpath = KFileDialog::getOpenFileName(KUrl("kfiledialog:///clipfolder"), QString(), kapp->activeWindow(), i18n("Looking for %1", path));
+ else if (res == KMessageBox::Cancel) {
+ // Abort project loading
+ action = KMessageBox::Cancel;
+ }
+ }
}
if (action == KMessageBox::Yes) {
kDebug() << "// ASKED FOR SRCH CLIP: " << clipId;
if (!m_searchFolder.isEmpty()) {
newpath = searchFileRecursively(QDir(m_searchFolder), size, hash);
}
+ } else if (action == KMessageBox::Cancel) {
+ m_abortLoading = true;
+ return;
}
if (!newpath.isEmpty()) {
if (elem.attribute("type").toInt() == SLIDESHOW) newpath.append('/' + extension);
clip = new DocClipBase(m_clipManager, elem, producerId);
m_clipManager->addClip(clip);
}
+
if (createClipItem) {
emit addProjectClip(clip);
qApp->processEvents();
}
-void KdenliveDoc::setNewClipResource(const QString &id, const QString &path) {
+void KdenliveDoc::setNewClipResource(const QString &id, const QString &path)
+{
QDomNodeList prods = m_document.elementsByTagName("producer");
int maxprod = prods.count();
for (int i = 0; i < maxprod; i++) {
QDomNode m = prods.at(i);
QString prodId = m.toElement().attribute("id");
- if (prodId == id || prodId.startsWith(id + "_")) {
+ if (prodId == id || prodId.startsWith(id + '_')) {
QDomNodeList params = m.childNodes();
for (int j = 0; j < params.count(); j++) {
QDomElement e = params.item(j).toElement();
}
}
-QString KdenliveDoc::searchFileRecursively(const QDir &dir, const QString &matchSize, const QString &matchHash) const {
+QString KdenliveDoc::searchFileRecursively(const QDir &dir, const QString &matchSize, const QString &matchHash) const
+{
QString foundFileName;
QByteArray fileData;
QByteArray fileHash;
return foundFileName;
}
-void KdenliveDoc::addClipInfo(QDomElement elem, QDomElement orig, QString clipId) {
+void KdenliveDoc::addClipInfo(QDomElement elem, QDomElement orig, QString clipId)
+{
DocClipBase *clip = m_clipManager->getClipById(clipId);
if (clip == NULL) {
addClip(elem, clipId, false);
m = m.nextSibling();
}
if (!meta.isEmpty()) {
- clip = m_clipManager->getClipById(clipId);
+ if (clip == NULL) clip = m_clipManager->getClipById(clipId);
if (clip) clip->setMetadata(meta);
}
}
}
-void KdenliveDoc::addFolder(const QString foldername, const QString &clipId, bool edit) {
- emit addProjectFolder(foldername, clipId, false, edit);
-}
-
-void KdenliveDoc::deleteFolder(const QString foldername, const QString &clipId) {
- emit addProjectFolder(foldername, clipId, true);
-}
-
-void KdenliveDoc::deleteProjectClip(QList <QString> ids) {
+void KdenliveDoc::deleteProjectClip(QList <QString> ids)
+{
for (int i = 0; i < ids.size(); ++i) {
emit deleteTimelineClip(ids.at(i));
m_clipManager->slotDeleteClip(ids.at(i));
setModified(true);
}
-void KdenliveDoc::deleteProjectFolder(QMap <QString, QString> map) {
- QMapIterator<QString, QString> i(map);
- while (i.hasNext()) {
- i.next();
- slotDeleteFolder(i.key(), i.value());
- }
- setModified(true);
-}
-
-void KdenliveDoc::deleteClip(const QString &clipId) {
+void KdenliveDoc::deleteClip(const QString &clipId)
+{
emit signalDeleteProjectClip(clipId);
m_clipManager->deleteClip(clipId);
}
-void KdenliveDoc::slotAddClipList(const KUrl::List urls, const QString group, const QString &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;
+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::slotAddFolder(const QString folderName) {
- AddFolderCommand *command = new AddFolderCommand(this, folderName, QString::number(m_clipManager->getFreeClipId()), true);
- commandStack()->push(command);
- setModified(true);
-}
-
-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, const QString &clipId) {
- EditFolderCommand *command = new EditFolderCommand(this, newfolderName, oldfolderName, clipId, false);
- commandStack()->push(command);
- setModified(true);
-}
-
-const QString&KdenliveDoc::getFreeClipId() {
+const QString KdenliveDoc::getFreeClipId()
+{
return QString::number(m_clipManager->getFreeClipId());
}
-DocClipBase *KdenliveDoc::getBaseClip(const QString &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 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, 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, const QString &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());
if (dia_ui->exec() == QDialog::Accepted) {
QStringList titleInfo = TitleWidget::getFreeTitleInfo(projectFolder());
- QPixmap pix = dia_ui->renderedPixmap();
+ QImage pix = dia_ui->renderedPixmap();
pix.save(titleInfo.at(1));
//dia_ui->saveTitle(path + ".kdenlivetitle");
m_clipManager->slotAddTextClipFile(titleInfo.at(0), titleInfo.at(1), dia_ui->xml().toString(), QString(), QString());
delete dia_ui;
}
-int KdenliveDoc::tracksCount() const {
+int KdenliveDoc::tracksCount() const
+{
return m_tracksList.count();
}
-TrackInfo KdenliveDoc::trackInfoAt(int ix) const {
+TrackInfo KdenliveDoc::trackInfoAt(int ix) const
+{
return m_tracksList.at(ix);
}
-void KdenliveDoc::switchTrackAudio(int ix, bool hide) {
+void KdenliveDoc::switchTrackAudio(int ix, bool hide)
+{
m_tracksList[ix].isMute = hide; // !m_tracksList.at(ix).isMute;
}
-void KdenliveDoc::switchTrackVideo(int ix, bool hide) {
+void KdenliveDoc::switchTrackLock(int ix, bool lock)
+{
+ m_tracksList[ix].isLocked = lock;
+}
+
+bool KdenliveDoc::isTrackLocked(int ix) const
+{
+ return m_tracksList.at(ix).isLocked;
+}
+
+void KdenliveDoc::switchTrackVideo(int ix, bool hide)
+{
m_tracksList[ix].isBlind = hide; // !m_tracksList.at(ix).isBlind;
}
-void KdenliveDoc::insertTrack(int ix, TrackInfo type) {
+void KdenliveDoc::insertTrack(int ix, TrackInfo type)
+{
if (ix == -1) m_tracksList << type;
else m_tracksList.insert(ix, type);
}
-void KdenliveDoc::deleteTrack(int ix) {
+void KdenliveDoc::deleteTrack(int ix)
+{
m_tracksList.removeAt(ix);
}
-void KdenliveDoc::setTrackType(int ix, TrackInfo type) {
+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;
+ m_tracksList[ix].isLocked = type.isLocked;
}
-const QList <TrackInfo> KdenliveDoc::tracksList() const {
+const QList <TrackInfo> KdenliveDoc::tracksList() const
+{
return m_tracksList;
}
-QPoint KdenliveDoc::getTracksCount() const {
+QPoint KdenliveDoc::getTracksCount() const
+{
int audio = 0;
int video = 0;
foreach(const TrackInfo &info, m_tracksList) {
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;
-}
-
-void KdenliveDoc::cachePixmap(const QString &fileId, const QPixmap &pix) const {
+void KdenliveDoc::cachePixmap(const QString &fileId, const QPixmap &pix) const
+{
pix.save(m_projectFolder.path() + "/thumbs/" + fileId + ".png");
}
-QString KdenliveDoc::getLadspaFile() const {
+QString KdenliveDoc::getLadspaFile() const
+{
int ct = 0;
QString counter = QString::number(ct).rightJustified(5, '0', false);
while (QFile::exists(m_projectFolder.path() + "/ladspa/" + counter + ".ladspa")) {