#include <QCryptographicHash>
#include <QFile>
#include <QInputDialog>
+#include <QDomImplementation>
#include <mlt++/Mlt.h>
-const double DOCUMENTVERSION = 0.83;
+const double DOCUMENTVERSION = 0.85;
KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup *undoGroup, QString profileName, const QPoint tracks, Render *render, MainWindow *parent) :
- QObject(parent),
- m_autosave(NULL),
- m_url(url),
- 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)
+ QObject(parent),
+ m_autosave(NULL),
+ m_url(url),
+ m_render(render),
+ m_commandStack(new QUndoStack(undoGroup)),
+ m_modified(false),
+ m_projectFolder(projectFolder),
+ m_abortLoading(false)
{
m_clipManager = new ClipManager(this);
m_autoSaveTimer = new QTimer(this);
// init default document properties
m_documentProperties["zoom"] = "7";
+ m_documentProperties["verticalzoom"] = "1";
m_documentProperties["zonein"] = "0";
m_documentProperties["zoneout"] = "100";
- if (!url.isEmpty()) {
+ if(!url.isEmpty()) {
QString tmpFile;
success = KIO::NetAccess::download(url.path(), tmpFile, parent);
- if (!success) // The file cannot be opened
+ if(!success) // The file cannot be opened
KMessageBox::error(parent, KIO::NetAccess::lastErrorString());
else {
QFile file(tmpFile);
QString errorMsg;
+ QDomImplementation impl;
+ impl.setInvalidDataPolicy(QDomImplementation::DropInvalidChars);
success = m_document.setContent(&file, false, &errorMsg);
file.close();
KIO::NetAccess::removeTempFile(tmpFile);
- if (!success) // It is corrupted
+
+ if(!success) // It is corrupted
KMessageBox::error(parent, errorMsg);
else {
+ parent->slotGotProgressInfo(i18n("Validating"), 0);
DocumentValidator validator(m_document);
success = validator.isProject();
- if (!success) // It is not a project file
- parent->slotGotProgressInfo(i18n("File %1 is not a Kdenlive project file.", m_url.path()), 100);
- else {
+ if(!success) {
+ // It is not a project file
+ parent->slotGotProgressInfo(i18n("File %1 is not a Kdenlive project file", m_url.path()), 0);
+ } else {
/*
* Validate the file against the current version (upgrade
* and recover it if needed). It is NOT a passive operation
*/
// TODO: backup the document or alert the user?
success = validator.validate(DOCUMENTVERSION);
- if (success) { // Let the validator handle error messages
- setModified(validator.isModified());
+ if(success) { // Let the validator handle error messages
+ parent->slotGotProgressInfo(i18n("Loading"), 0);
QDomElement mlt = m_document.firstChildElement("mlt");
QDomElement infoXml = mlt.firstChildElement("kdenlivedoc");
profileName = infoXml.attribute("profile");
- m_projectFolder = infoXml.attribute("projectfolder");
- m_startPos = infoXml.attribute("position").toInt();
-
+ m_projectFolder = KUrl(infoXml.attribute("projectfolder"));
QDomElement docproperties = infoXml.firstChildElement("documentproperties");
QDomNamedNodeMap props = docproperties.attributes();
- for (int i = 0; i < props.count(); i++) {
+ for(int i = 0; i < props.count(); i++) {
m_documentProperties.insert(props.item(i).nodeName(), props.item(i).nodeValue());
}
-
// Build tracks
QDomElement e;
QDomElement tracksinfo = infoXml.firstChildElement("tracksinfo");
TrackInfo projectTrack;
- if (!tracksinfo.isNull()) {
+ if(!tracksinfo.isNull()) {
QDomNodeList trackslist = tracksinfo.childNodes();
int maxchild = trackslist.count();
- for (int k = 0; k < maxchild; k++) {
+ for(int k = 0; k < maxchild; k++) {
e = trackslist.at(k).toElement();
- if (e.tagName() == "trackinfo") {
- if (e.attribute("type") == "audio") projectTrack.type = AUDIOTRACK;
+ 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();
+ projectTrack.trackName = e.attribute("trackname");
m_tracksList.append(projectTrack);
}
}
}
QDomNodeList producers = m_document.elementsByTagName("producer");
QDomNodeList infoproducers = m_document.elementsByTagName("kdenlive_producer");
- if (checkDocumentClips(infoproducers) == false) m_abortLoading = true;
+ parent->slotGotProgressInfo(i18n("Check missing clips"), 0);
+ if(checkDocumentClips(infoproducers) == false) m_abortLoading = true;
const int max = producers.count();
const int infomax = infoproducers.count();
- QDomNodeList folders = m_document.elementsByTagName("folder");
- for (int i = 0; i < folders.count(); i++) {
+ 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 && !m_abortLoading; i++) {
+ for(int i = 0; i < infomax && !m_abortLoading; 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") && !m_abortLoading) {
+ 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++) {
+ for(int j = 0; j < max; j++) {
QDomElement o = producers.item(j).cloneNode().toElement();
QString origId = o.attribute("id").section('_', 0, 0);
- if (origId == prodId) {
+ if(origId == prodId) {
orig = o;
break;
}
}
addClipInfo(e, orig, prodId);
- kDebug() << "// KDENLIVE PRODUCER: " << prodId;
}
}
- if (m_abortLoading) {
+ if(m_abortLoading) {
//parent->slotGotProgressInfo(i18n("File %1 is not a Kdenlive project file."), 100);
emit resetProjectList();
- m_startPos = 0;
+ m_documentProperties.remove("position");
m_url = KUrl();
m_tracksList.clear();
kWarning() << "Aborted loading of: " << url.path();
m_clipManager->clear();
} else {
QDomElement markers = infoXml.firstChildElement("markers");
- if (!markers.isNull()) {
+ if(!markers.isNull()) {
QDomNodeList markerslist = markers.childNodes();
int maxchild = markerslist.count();
- for (int k = 0; k < maxchild; k++) {
+ for(int k = 0; k < maxchild; k++) {
e = markerslist.at(k).toElement();
- if (e.tagName() == "marker") {
+ if(e.tagName() == "marker") {
m_clipManager->getClipById(e.attribute("id"))->addSnapMarker(GenTime(e.attribute("time").toDouble()), e.attribute("comment"));
}
}
infoXml.removeChild(markers);
}
setProfilePath(profileName);
+ setModified(validator.isModified());
kDebug() << "Reading file: " << url.path() << ", found clips: " << producers.count();
}
}
}
}
}
- } else setProfilePath(profileName);
+ }
// Something went wrong, or a new file was requested: create a new project
- if (!success) {
+ if(!success) {
+ setProfilePath(profileName);
m_url = KUrl();
m_document = createEmptyDocument(tracks.x(), tracks.y());
}
+ KdenliveSettings::setCurrent_profile(profilePath());
+
// Set the video profile (empty == default)
// Make sure the project folder is usable
- if (m_projectFolder.isEmpty() || !KIO::NetAccess::exists(m_projectFolder.path(), KIO::NetAccess::DestinationSide, parent)) {
+ if(m_projectFolder.isEmpty() || !KIO::NetAccess::exists(m_projectFolder.path(), KIO::NetAccess::DestinationSide, parent)) {
KMessageBox::information(parent, i18n("Document project folder is invalid, setting it to the default one: %1", KdenliveSettings::defaultprojectfolder()));
m_projectFolder = KUrl(KdenliveSettings::defaultprojectfolder());
}
// Make sure that the necessary folders exist
- KStandardDirs::makeDir(m_projectFolder.path() + "/titles/");
- KStandardDirs::makeDir(m_projectFolder.path() + "/thumbs/");
- KStandardDirs::makeDir(m_projectFolder.path() + "/ladspa/");
+ KStandardDirs::makeDir(m_projectFolder.path(KUrl::AddTrailingSlash) + "titles/");
+ KStandardDirs::makeDir(m_projectFolder.path(KUrl::AddTrailingSlash) + "thumbs/");
+ KStandardDirs::makeDir(m_projectFolder.path(KUrl::AddTrailingSlash) + "ladspa/");
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);
+ if(m_fps == 30000.0 / 1001.0) m_timecode.setFormat(m_fps, true);
+ else m_timecode.setFormat(m_fps);
//kDebug() << "// SETTING SCENE LIST:\n\n" << m_document.toString();
connect(m_autoSaveTimer, SIGNAL(timeout()), this, SLOT(slotAutoSave()));
KdenliveDoc::~KdenliveDoc()
{
+ m_autoSaveTimer->stop();
delete m_commandStack;
+ kDebug() << "// DEL CLP MAN";
delete m_clipManager;
+ kDebug() << "// DEL CLP MAN done";
delete m_autoSaveTimer;
- if (m_autosave) {
- if (!m_autosave->fileName().isEmpty()) m_autosave->remove();
+ if(m_autosave) {
+ if(!m_autosave->fileName().isEmpty()) m_autosave->remove();
delete m_autosave;
}
}
-void KdenliveDoc::setSceneList()
+int KdenliveDoc::setSceneList()
{
- m_render->setSceneList(m_document.toString(), m_startPos);
+ m_render->resetProfile(KdenliveSettings::current_profile());
+ if(m_render->setSceneList(m_document.toString(), m_documentProperties.value("position").toInt()) == -1) {
+ // INVALID MLT Consumer, something is wrong
+ return -1;
+ }
+ m_documentProperties.remove("position");
// m_document xml is now useless, clear it
m_document.clear();
- checkProjectClips();
+ return 0;
}
-QDomDocument KdenliveDoc::createEmptyDocument(const int videotracks, const int audiotracks)
+QDomDocument KdenliveDoc::createEmptyDocument(int videotracks, int audiotracks)
{
- // Creating new document
- QDomDocument doc;
- QDomElement mlt = doc.createElement("mlt");
- doc.appendChild(mlt);
-
-
TrackInfo videoTrack;
videoTrack.type = VIDEOTRACK;
videoTrack.isMute = false;
audioTrack.isBlind = true;
audioTrack.isLocked = false;
+ m_tracksList.clear();
+
+ // Tracks are added «backwards», so we need to reverse the track numbering
+ // mbt 331: http://www.kdenlive.org/mantis/view.php?id=331
+ // Better default names for tracks: Audio 1 etc. instead of blank numbers
+ for(int i = 0; i < audiotracks; i++) {
+ audioTrack.trackName = QString("Audio ") + QString::number(audiotracks - i);
+ m_tracksList.append(audioTrack);
+
+ }
+ for(int i = 0; i < videotracks; i++) {
+ videoTrack.trackName = QString("Video ") + QString::number(videotracks - i);
+ m_tracksList.append(videoTrack);
+ }
+ return createEmptyDocument(m_tracksList);
+}
+
+QDomDocument KdenliveDoc::createEmptyDocument(QList <TrackInfo> tracks)
+{
+ // Creating new document
+ QDomDocument doc;
+ QDomElement mlt = doc.createElement("mlt");
+ doc.appendChild(mlt);
+
+
+ // Create black producer
+ // For some unknown reason, we have to build the black producer here and not in renderer.cpp, otherwise
+ // the composite transitions with the black track are corrupted.
+ QDomElement blk = doc.createElement("producer");
+ blk.setAttribute("in", 0);
+ blk.setAttribute("out", 500);
+ blk.setAttribute("id", "black");
+
+ QDomElement property = doc.createElement("property");
+ property.setAttribute("name", "mlt_type");
+ QDomText value = doc.createTextNode("producer");
+ property.appendChild(value);
+ blk.appendChild(property);
+
+ property = doc.createElement("property");
+ property.setAttribute("name", "aspect_ratio");
+ value = doc.createTextNode(QString::number(0.0));
+ property.appendChild(value);
+ blk.appendChild(property);
+
+ property = doc.createElement("property");
+ property.setAttribute("name", "length");
+ value = doc.createTextNode(QString::number(15000));
+ property.appendChild(value);
+ blk.appendChild(property);
+
+ property = doc.createElement("property");
+ property.setAttribute("name", "eof");
+ value = doc.createTextNode("pause");
+ property.appendChild(value);
+ blk.appendChild(property);
+
+ property = doc.createElement("property");
+ property.setAttribute("name", "resource");
+ value = doc.createTextNode("black");
+ property.appendChild(value);
+ blk.appendChild(property);
+
+ property = doc.createElement("property");
+ property.setAttribute("name", "mlt_service");
+ value = doc.createTextNode("colour");
+ property.appendChild(value);
+ blk.appendChild(property);
+
+ mlt.appendChild(blk);
+
+
QDomElement tractor = doc.createElement("tractor");
tractor.setAttribute("id", "maintractor");
QDomElement multitrack = doc.createElement("multitrack");
playlist.setAttribute("id", "black_track");
mlt.appendChild(playlist);
+ QDomElement blank0 = doc.createElement("entry");
+ blank0.setAttribute("in", "0");
+ blank0.setAttribute("out", "1");
+ blank0.setAttribute("producer", "black");
+ playlist.appendChild(blank0);
// create playlists
- int total = audiotracks + videotracks + 1;
+ int total = tracks.count() + 1;
- for (int i = 1; i < total; i++) {
+ for(int i = 1; i < total; i++) {
QDomElement playlist = doc.createElement("playlist");
playlist.setAttribute("id", "playlist" + QString::number(i));
mlt.appendChild(playlist);
track0.setAttribute("producer", "black_track");
tractor.appendChild(track0);
- // 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);
- m_tracksList.append(audioTrack);
- }
-
- // create video tracks
- for (int i = audiotracks + 1; i < total; i++) {
+ // create audio and video tracks
+ for(int i = 1; i < total; i++) {
QDomElement track = doc.createElement("track");
track.setAttribute("producer", "playlist" + QString::number(i));
+ if(tracks.at(i - 1).type == AUDIOTRACK) {
+ track.setAttribute("hide", "video");
+ } else if(tracks.at(i - 1).isBlind)
+ track.setAttribute("hide", "video");
+ if(tracks.at(i - 1).isMute)
+ track.setAttribute("hide", "audio");
tractor.appendChild(track);
- m_tracksList.append(videoTrack);
}
- for (int i = 2; i < total ; i++) {
+ for(int i = 2; i < total ; i++) {
QDomElement transition = doc.createElement("transition");
transition.setAttribute("always_active", "1");
m_guidesXml.appendChild(guideNode);
QDomElement e;
- for (int i = 0; i < guides.count(); i++) {
+ for(int i = 0; i < guides.count(); i++) {
e = m_guidesXml.createElement("guide");
e.setAttribute("time", guides.at(i)->position().ms() / 1000);
e.setAttribute("comment", guides.at(i)->label());
void KdenliveDoc::slotAutoSave()
{
- if (m_render && m_autosave) {
- if (!m_autosave->isOpen() && !m_autosave->open(QIODevice::ReadWrite)) {
+ 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();
QString doc;
- if (KdenliveSettings::dropbframes()) {
+ if(KdenliveSettings::dropbframes()) {
KdenliveSettings::setDropbframes(false);
m_clipManager->updatePreviewSettings();
doc = m_render->sceneList();
}
}
-void KdenliveDoc::setZoom(int factor)
+void KdenliveDoc::setZoom(int horizontal, int vertical)
{
- m_documentProperties["zoom"] = QString::number(factor);
+ m_documentProperties["zoom"] = QString::number(horizontal);
+ m_documentProperties["verticalzoom"] = QString::number(vertical);
}
-int KdenliveDoc::zoom() const
+QPoint KdenliveDoc::zoom() const
{
- return m_documentProperties.value("zoom").toInt();
+ return QPoint(m_documentProperties.value("zoom").toInt(), m_documentProperties.value("verticalzoom").toInt());
}
void KdenliveDoc::setZone(int start, int end)
QDomDocument sceneList;
sceneList.setContent(scene, true);
QDomElement mlt = sceneList.firstChildElement("mlt");
+ if(mlt.isNull() || !mlt.hasChildNodes()) {
+ //Make sure we don't save if scenelist is corrupted
+ KMessageBox::error(kapp->activeWindow(), i18n("Cannot write to file %1", path));
+ return false;
+ }
QDomElement addedXml = sceneList.createElement("kdenlivedoc");
mlt.appendChild(addedXml);
addedXml.setAttribute("version", DOCUMENTVERSION);
addedXml.setAttribute("kdenliveversion", VERSION);
addedXml.setAttribute("profile", profilePath());
- addedXml.setAttribute("position", m_render->seekPosition().frames(m_fps));
addedXml.setAttribute("projectfolder", m_projectFolder.path());
QDomElement docproperties = sceneList.createElement("documentproperties");
QMapIterator<QString, QString> i(m_documentProperties);
- while (i.hasNext()) {
+ while(i.hasNext()) {
i.next();
docproperties.setAttribute(i.key(), i.value());
}
+ docproperties.setAttribute("position", m_render->seekPosition().frames(m_fps));
addedXml.appendChild(docproperties);
// Add profile info
// tracks info
QDomElement tracksinfo = sceneList.createElement("tracksinfo");
- foreach(const TrackInfo &info, m_tracksList) {
+ foreach(const TrackInfo & info, m_tracksList) {
QDomElement trackinfo = sceneList.createElement("trackinfo");
- if (info.type == AUDIOTRACK) trackinfo.setAttribute("type", "audio");
+ if(info.type == AUDIOTRACK) trackinfo.setAttribute("type", "audio");
trackinfo.setAttribute("mute", info.isMute);
trackinfo.setAttribute("blind", info.isBlind);
trackinfo.setAttribute("locked", info.isLocked);
+ trackinfo.setAttribute("trackname", info.trackName);
tracksinfo.appendChild(trackinfo);
}
addedXml.appendChild(tracksinfo);
QMap <QString, QString> folderlist = m_clipManager->documentFolderList();
QMapIterator<QString, QString> f(folderlist);
- while (f.hasNext()) {
+ while(f.hasNext()) {
f.next();
QDomElement folder = sceneList.createElement("folder");
folder.setAttribute("id", f.key());
// Save project clips
QDomElement e;
QList <DocClipBase*> list = m_clipManager->documentClipList();
- for (int i = 0; i < list.count(); i++) {
+ for(int i = 0; i < list.count(); i++) {
e = list.at(i)->toXML();
e.setTagName("kdenlive_producer");
addedXml.appendChild(sceneList.importNode(e, true));
QList < CommentedTime > marks = list.at(i)->commentedSnapMarkers();
- for (int j = 0; j < marks.count(); j++) {
+ for(int j = 0; j < marks.count(); j++) {
QDomElement marker = sceneList.createElement("marker");
marker.setAttribute("time", marks.at(j).time().ms() / 1000);
marker.setAttribute("comment", marks.at(j).comment());
addedXml.appendChild(markers);
// Add guides
- if (!m_guidesXml.isNull()) addedXml.appendChild(sceneList.importNode(m_guidesXml.documentElement(), true));
+ 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);
- if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
+ if(!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
kWarning() << "////// ERROR writing to file: " << path;
KMessageBox::error(kapp->activeWindow(), i18n("Cannot write to file %1", path));
return false;
}
file.write(sceneList.toString().toUtf8());
- if (file.error() != QFile::NoError) {
+ if(file.error() != QFile::NoError) {
KMessageBox::error(kapp->activeWindow(), i18n("Cannot write to file %1", path));
file.close();
return false;
void KdenliveDoc::setProjectFolder(KUrl url)
{
- if (url == m_projectFolder) return;
+ 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);
+ KStandardDirs::makeDir(url.path(KUrl::AddTrailingSlash) + "titles/");
+ KStandardDirs::makeDir(url.path(KUrl::AddTrailingSlash) + "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);
m_projectFolder = url;
}
{
QList <DocClipBase*> list = m_clipManager->documentClipList();
//TODO: Also move ladspa effects files
- for (int i = 0; i < list.count(); i++) {
+ for(int i = 0; i < list.count(); i++) {
DocClipBase *clip = list.at(i);
- if (clip->clipType() == TEXT) {
+ if(clip->clipType() == TEXT) {
// the image for title clip must be moved
KUrl oldUrl = clip->fileURL();
- KUrl newUrl = KUrl(url.path() + "/titles/" + oldUrl.fileName());
+ KUrl newUrl = KUrl(url.path(KUrl::AddTrailingSlash) + "titles/" + oldUrl.fileName());
KIO::Job *job = KIO::copy(oldUrl, newUrl);
- if (KIO::NetAccess::synchronousRun(job, 0)) clip->setProperty("resource", newUrl.path());
+ if(KIO::NetAccess::synchronousRun(job, 0)) clip->setProperty("resource", newUrl.path());
}
QString hash = clip->getClipHash();
- KUrl oldVideoThumbUrl = KUrl(m_projectFolder.path() + "/thumbs/" + hash + ".png");
- KUrl oldAudioThumbUrl = KUrl(m_projectFolder.path() + "/thumbs/" + hash + ".thumb");
- if (KIO::NetAccess::exists(oldVideoThumbUrl, KIO::NetAccess::SourceSide, 0)) {
- KUrl newUrl = KUrl(url.path() + "/thumbs/" + hash + ".png");
+ KUrl oldVideoThumbUrl = KUrl(m_projectFolder.path(KUrl::AddTrailingSlash) + "thumbs/" + hash + ".png");
+ KUrl oldAudioThumbUrl = KUrl(m_projectFolder.path(KUrl::AddTrailingSlash) + "thumbs/" + hash + ".thumb");
+ if(KIO::NetAccess::exists(oldVideoThumbUrl, KIO::NetAccess::SourceSide, 0)) {
+ KUrl newUrl = KUrl(url.path(KUrl::AddTrailingSlash) + "thumbs/" + hash + ".png");
KIO::Job *job = KIO::copy(oldVideoThumbUrl, newUrl);
KIO::NetAccess::synchronousRun(job, 0);
}
- if (KIO::NetAccess::exists(oldAudioThumbUrl, KIO::NetAccess::SourceSide, 0)) {
- KUrl newUrl = KUrl(url.path() + "/thumbs/" + hash + ".thumb");
+ if(KIO::NetAccess::exists(oldAudioThumbUrl, KIO::NetAccess::SourceSide, 0)) {
+ KUrl newUrl = KUrl(url.path(KUrl::AddTrailingSlash) + "thumbs/" + hash + ".thumb");
KIO::Job *job = KIO::copy(oldAudioThumbUrl, newUrl);
- if (KIO::NetAccess::synchronousRun(job, 0)) clip->refreshThumbUrl();
+ if(KIO::NetAccess::synchronousRun(job, 0)) clip->refreshThumbUrl();
}
}
}
return m_profile;
}
-void KdenliveDoc::setProfilePath(QString path)
+bool KdenliveDoc::setProfilePath(QString path)
{
- if (path.isEmpty()) path = KdenliveSettings::default_profile();
- if (path.isEmpty()) path = "dv_pal";
+ if(path.isEmpty()) path = KdenliveSettings::default_profile();
+ if(path.isEmpty()) path = "dv_pal";
m_profile = ProfilesDialog::getVideoProfile(path);
- if (m_profile.path.isEmpty()) {
+ bool current_fps = m_fps;
+ if(m_profile.path.isEmpty()) {
// Profile not found, use embedded profile
QDomElement profileInfo = m_document.elementsByTagName("profileinfo").at(0).toElement();
- if (profileInfo.isNull()) {
+ if(profileInfo.isNull()) {
KMessageBox::information(kapp->activeWindow(), i18n("Project profile was not found, using default profile."), i18n("Missing Profile"));
m_profile = ProfilesDialog::getVideoProfile(KdenliveSettings::default_profile());
} else {
m_profile.display_aspect_num = profileInfo.attribute("display_aspect_num").toInt();
m_profile.display_aspect_den = profileInfo.attribute("display_aspect_den").toInt();
QString existing = ProfilesDialog::existingProfile(m_profile);
- if (!existing.isEmpty()) {
+ if(!existing.isEmpty()) {
m_profile = ProfilesDialog::getVideoProfile(existing);
KMessageBox::information(kapp->activeWindow(), i18n("Project profile not found, replacing with existing one: %1", m_profile.description), i18n("Missing Profile"));
} else {
QString newDesc = m_profile.description;
bool ok = true;
- while (ok && (newDesc.isEmpty() || ProfilesDialog::existingProfileDescription(newDesc))) {
+ while(ok && (newDesc.isEmpty() || ProfilesDialog::existingProfileDescription(newDesc))) {
newDesc = QInputDialog::getText(kapp->activeWindow(), i18n("Existing Profile"), i18n("Your project uses an unknown profile.\nIt uses an existing profile name: %1.\nPlease choose a new name to save it", newDesc), QLineEdit::Normal, newDesc, &ok);
}
- if (ok == false) {
+ if(ok == false) {
// User canceled, use default profile
m_profile = ProfilesDialog::getVideoProfile(KdenliveSettings::default_profile());
} else {
- if (newDesc != m_profile.description) {
+ if(newDesc != m_profile.description) {
// Profile description existed, was replaced by new one
m_profile.description = newDesc;
} else {
m_width = m_profile.width;
m_height = m_profile.height;
kDebug() << "Kdenlive 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);
+ if(m_fps == 30000.0 / 1001.0) m_timecode.setFormat(m_fps, true);
+ else m_timecode.setFormat(m_fps);
+ return (current_fps != m_fps);
}
double KdenliveDoc::dar()
emit progressInfo(message, progress);
}
-void KdenliveDoc::loadingProgressed()
-{
- m_documentLoadingProgress += m_documentLoadingStep;
- emit progressInfo(QString(), (int) m_documentLoadingProgress);
-}
-
QUndoStack *KdenliveDoc::commandStack()
{
return m_commandStack;
void KdenliveDoc::checkProjectClips()
{
- kDebug() << "+++++++++++++ + + + + CHK PCLIPS";
- if (m_render == NULL) return;
+ 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 ;
- QString prodTrack ;
- for (int i = 0; i < prods.count(); i++) {
- id = prods.at(i)->get("id");
- prodId = id.section('_', 0, 0);
- prodTrack = id.section('_', 1, 1);
- DocClipBase *clip = m_clipManager->getClipById(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("name");
- QString titleresource;
- if (titlename.isEmpty()) {
- QStringList titleInfo = TitleWidget::getFreeTitleInfo(projectFolder());
- titlename = titleInfo.at(0);
- titleresource = titleInfo.at(1);
- clip->setProperty("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(clip->getProperty("xmldata"));
- dia_ui->setXml(doc);
- QImage pix = dia_ui->renderedPixmap();
- pix.save(titleresource);
- clip->setProperty("resource", titleresource);
- delete dia_ui;
- clip->producer()->set("force_reload", 1);
- }
- }
}
void KdenliveDoc::updatePreviewSettings()
{
m_clipManager->updatePreviewSettings();
m_render->updatePreviewSettings();
+ QList <Mlt::Producer *> prods = m_render->producersList();
m_clipManager->resetProducersList(m_render->producersList());
-
+ qDeleteAll(prods);
+ prods.clear();
}
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)
{
- return m_timecode.getFrameCount(duration, m_fps);
+ return m_timecode.getFrameCount(duration);
}
QString KdenliveDoc::producerName(const QString &id)
QString result = "unnamed";
QDomNodeList prods = producersList();
int ct = prods.count();
- for (int i = 0; i < ct ; i++) {
+ for(int i = 0; i < ct ; i++) {
QDomElement e = prods.item(i).toElement();
- if (e.attribute("id") != "black" && e.attribute("id") == id) {
+ if(e.attribute("id") != "black" && e.attribute("id") == id) {
result = e.attribute("name");
- if (result.isEmpty()) result = KUrl(e.attribute("resource")).fileName();
+ if(result.isEmpty()) result = KUrl(e.attribute("resource")).fileName();
break;
}
}
double KdenliveDoc::projectDuration() const
{
- if (m_render)
+ if(m_render)
return GenTime(m_render->getLength(), m_fps).ms() / 1000;
else
return 0;
void KdenliveDoc::setModified(bool mod)
{
- if (!m_url.isEmpty() && mod && KdenliveSettings::crashrecovery()) {
+ if(!m_url.isEmpty() && mod && KdenliveSettings::crashrecovery()) {
m_autoSaveTimer->start(3000);
}
- if (mod == m_modified) return;
+ if(mod == m_modified) return;
m_modified = mod;
emit docModified(m_modified);
}
const QString KdenliveDoc::description() const
{
- if (m_url.isEmpty())
+ if(m_url.isEmpty())
return i18n("Untitled") + " / " + m_profile.description;
else
return m_url.fileName() + " / " + m_profile.description;
const QString producerId = clipId.section('_', 0, 0);
DocClipBase *clip = m_clipManager->getClipById(producerId);
- if (clip == NULL) {
+ if(clip == NULL) {
elem.setAttribute("id", producerId);
QString path = elem.attribute("resource");
QString extension;
- if (elem.attribute("type").toInt() == SLIDESHOW) {
+ 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() == false && QFile::exists(path) == false && elem.attribute("type").toInt() != TEXT && !elem.hasAttribute("placeholder")) {
+ if(path.isEmpty() == false && QFile::exists(path) == false && elem.attribute("type").toInt() != TEXT && !elem.hasAttribute("placeholder")) {
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;
int action = KMessageBox::No;
- if (!size.isEmpty() && !hash.isEmpty()) {
- if (!m_searchFolder.isEmpty()) newpath = searchFileRecursively(m_searchFolder, size, hash);
- 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")));
+ if(!size.isEmpty() && !hash.isEmpty()) {
+ if(!m_searchFolder.isEmpty()) newpath = searchFileRecursively(m_searchFolder, size, hash);
+ 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) {
- 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)
+ if(elem.attribute("type").toInt() == SLIDESHOW) {
+ 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 {
// Abort project loading
action = res;
}
} 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)
+ 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 {
// Abort project loading
}
}
}
- if (action == KMessageBox::Yes) {
+ if(action == KMessageBox::Yes) {
kDebug() << "// ASKED FOR SRCH CLIP: " << clipId;
m_searchFolder = KFileDialog::getExistingDirectory(KUrl("kfiledialog:///clipfolder"), kapp->activeWindow());
- if (!m_searchFolder.isEmpty()) {
+ if(!m_searchFolder.isEmpty()) {
newpath = searchFileRecursively(QDir(m_searchFolder), size, hash);
}
- } else if (action == KMessageBox::Cancel) {
+ } else if(action == KMessageBox::Cancel) {
m_abortLoading = true;
return;
- } else if (action == KMessageBox::No) {
+ } else if(action == KMessageBox::No) {
// Keep clip as placeHolder
elem.setAttribute("placeholder", '1');
}
- if (!newpath.isEmpty()) {
- if (elem.attribute("type").toInt() == SLIDESHOW) newpath.append('/' + extension);
+ if(!newpath.isEmpty()) {
+ if(elem.attribute("type").toInt() == SLIDESHOW) newpath.append('/' + extension);
elem.setAttribute("resource", newpath);
setNewClipResource(clipId, newpath);
setModified(true);
m_clipManager->addClip(clip);
}
- if (createClipItem) {
+ if(createClipItem) {
emit addProjectClip(clip);
- qApp->processEvents();
- m_render->getFileProperties(clip->toXML(), clip->getId());
+ //qApp->processEvents();
}
}
-
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++) {
+ 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++) {
+ for(int j = 0; j < params.count(); j++) {
QDomElement e = params.item(j).toElement();
- if (e.attribute("name") == "resource") {
+ if(e.attribute("name") == "resource") {
e.firstChild().setNodeValue(path);
break;
}
QByteArray fileData;
QByteArray fileHash;
QStringList filesAndDirs = dir.entryList(QDir::Files | QDir::Readable);
- for (int i = 0; i < filesAndDirs.size() && foundFileName.isEmpty(); i++) {
+ for(int i = 0; i < filesAndDirs.size() && foundFileName.isEmpty(); i++) {
QFile file(dir.absoluteFilePath(filesAndDirs.at(i)));
- if (file.open(QIODevice::ReadOnly)) {
- if (QString::number(file.size()) == matchSize) {
+ if(file.open(QIODevice::ReadOnly)) {
+ if(QString::number(file.size()) == matchSize) {
/*
* 1 MB = 1 second per 450 files (or faster)
* 10 MB = 9 seconds per 450 files (or faster)
*/
- if (file.size() > 1000000*2) {
+ if(file.size() > 1000000 * 2) {
fileData = file.read(1000000);
- if (file.seek(file.size() - 1000000))
+ if(file.seek(file.size() - 1000000))
fileData.append(file.readAll());
} else
fileData = file.readAll();
file.close();
fileHash = QCryptographicHash::hash(fileData, QCryptographicHash::Md5);
- if (QString(fileHash.toHex()) == matchHash)
+ if(QString(fileHash.toHex()) == matchHash)
return file.fileName();
}
}
kDebug() << filesAndDirs.at(i) << file.size() << fileHash.toHex();
}
filesAndDirs = dir.entryList(QDir::Dirs | QDir::Readable | QDir::Executable | QDir::NoDotAndDotDot);
- for (int i = 0; i < filesAndDirs.size() && foundFileName.isEmpty(); i++) {
+ for(int i = 0; i < filesAndDirs.size() && foundFileName.isEmpty(); i++) {
foundFileName = searchFileRecursively(dir.absoluteFilePath(filesAndDirs.at(i)), matchSize, matchHash);
- if (!foundFileName.isEmpty())
+ if(!foundFileName.isEmpty())
break;
}
return foundFileName;
void KdenliveDoc::addClipInfo(QDomElement elem, QDomElement orig, QString clipId)
{
DocClipBase *clip = m_clipManager->getClipById(clipId);
- if (clip == NULL) {
+ if(clip == NULL) {
addClip(elem, clipId, false);
} else {
QMap <QString, QString> properties;
QDomNamedNodeMap attributes = elem.attributes();
QString attrname;
- for (int i = 0; i < attributes.count(); i++) {
+ for(int i = 0; i < attributes.count(); i++) {
attrname = attributes.item(i).nodeName();
- if (attrname != "resource")
+ if(attrname != "resource")
properties.insert(attrname, attributes.item(i).nodeValue());
kDebug() << attrname << " = " << attributes.item(i).nodeValue();
}
clip->setProperties(properties);
emit addProjectClip(clip, false);
}
- if (orig != QDomElement()) {
+ if(orig != QDomElement()) {
QMap<QString, QString> meta;
QDomNode m = orig.firstChild();
- while (!m.isNull()) {
+ while(!m.isNull()) {
QString name = m.toElement().attribute("name");
- if (name.startsWith("meta.attr")) {
+ if(name.startsWith("meta.attr")) {
meta.insert(name.section('.', 2, 3), m.firstChild().nodeValue());
}
m = m.nextSibling();
}
- if (!meta.isEmpty()) {
- if (clip == NULL) clip = m_clipManager->getClipById(clipId);
- if (clip) clip->setMetadata(meta);
+ if(!meta.isEmpty()) {
+ if(clip == NULL) clip = m_clipManager->getClipById(clipId);
+ if(clip) clip->setMetadata(meta);
}
}
}
-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::deleteClip(const QString &clipId)
{
emit signalDeleteProjectClip(clipId);
- m_clipManager->deleteClip(clipId);
}
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()));
+ //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);
return m_clipManager->getClipById(clipId);
}
+void KdenliveDoc::slotCreateColorClip(const QString &name, const QString &color, const QString &duration, QString group, const QString &groupId)
+{
+ m_clipManager->slotAddColorClipFile(name, color, duration, group, groupId);
+ setModified(true);
+ emit selectLastAddedClip(QString::number(m_clipManager->lastClipId()));
+}
+
+void KdenliveDoc::slotCreateSlideshowClipFile(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, QString group, const QString &groupId)
+{
+ m_clipManager->slotAddSlideshowClipFile(name, path, count, duration, loop, fade, luma_duration, luma_file, softness, group, groupId);
+ setModified(true);
+ emit selectLastAddedClip(QString::number(m_clipManager->lastClipId()));
+}
+
void KdenliveDoc::slotCreateTextClip(QString group, const QString &groupId, const QString &templatePath)
{
- QString titlesFolder = projectFolder().path() + "/titles/";
+ QString titlesFolder = projectFolder().path(KUrl::AddTrailingSlash) + "titles/";
KStandardDirs::makeDir(titlesFolder);
- TitleWidget *dia_ui = new TitleWidget(templatePath, titlesFolder, m_render, kapp->activeWindow());
- if (dia_ui->exec() == QDialog::Accepted) {
- QStringList titleInfo = TitleWidget::getFreeTitleInfo(projectFolder());
- 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(), group, groupId);
+ TitleWidget *dia_ui = new TitleWidget(templatePath, m_timecode, titlesFolder, m_render, kapp->activeWindow());
+ if(dia_ui->exec() == QDialog::Accepted) {
+ m_clipManager->slotAddTextClipFile(i18n("Title clip"), dia_ui->outPoint(), dia_ui->xml().toString(), group, groupId);
setModified(true);
+ emit selectLastAddedClip(QString::number(m_clipManager->lastClipId()));
}
delete dia_ui;
}
void KdenliveDoc::slotCreateTextTemplateClip(QString group, const QString &groupId, KUrl path)
{
- QString titlesFolder = projectFolder().path() + "/titles/";
- if (path.isEmpty()) {
+ QString titlesFolder = projectFolder().path(KUrl::AddTrailingSlash) + "titles/";
+ if(path.isEmpty()) {
path = KFileDialog::getOpenUrl(KUrl(titlesFolder), "*.kdenlivetitle", kapp->activeWindow(), i18n("Enter Template Path"));
}
- if (path.isEmpty()) return;
-
- QStringList titleInfo = TitleWidget::getFreeTitleInfo(projectFolder());
+ if(path.isEmpty()) return;
- TitleWidget *dia_ui = new TitleWidget(path, titlesFolder, m_render, kapp->activeWindow());
- QImage pix = dia_ui->renderedPixmap();
- pix.save(titleInfo.at(1));
- delete dia_ui;
- m_clipManager->slotAddTextTemplateClip(titleInfo.at(0), titleInfo.at(1), path, group, groupId);
+ //TODO: rewrite with new title system (just set resource)
+ m_clipManager->slotAddTextTemplateClip(i18n("Template title clip"), path, group, groupId);
setModified(true);
+ emit selectLastAddedClip(QString::number(m_clipManager->lastClipId()));
}
int KdenliveDoc::tracksCount() const
void KdenliveDoc::insertTrack(int ix, TrackInfo type)
{
- if (ix == -1) m_tracksList << type;
+ if(ix == -1) m_tracksList << type;
else m_tracksList.insert(ix, type);
}
m_tracksList[ix].isMute = type.isMute;
m_tracksList[ix].isBlind = type.isBlind;
m_tracksList[ix].isLocked = type.isLocked;
+ m_tracksList[ix].trackName = type.trackName;
}
const QList <TrackInfo> KdenliveDoc::tracksList() const
{
int audio = 0;
int video = 0;
- foreach(const TrackInfo &info, m_tracksList) {
- if (info.type == VIDEOTRACK) video++;
+ foreach(const TrackInfo & info, m_tracksList) {
+ if(info.type == VIDEOTRACK) video++;
else audio++;
}
return QPoint(video, audio);
void KdenliveDoc::cachePixmap(const QString &fileId, const QPixmap &pix) const
{
- pix.save(m_projectFolder.path() + "/thumbs/" + fileId + ".png");
+ pix.save(m_projectFolder.path(KUrl::AddTrailingSlash) + "thumbs/" + fileId + ".png");
}
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")) {
+ while(QFile::exists(m_projectFolder.path(KUrl::AddTrailingSlash) + "ladspa/" + counter + ".ladspa")) {
ct++;
counter = QString::number(ct).rightJustified(5, '0', false);
}
- return m_projectFolder.path() + "/ladspa/" + counter + ".ladspa";
+ return m_projectFolder.path(KUrl::AddTrailingSlash) + "ladspa/" + counter + ".ladspa";
}
bool KdenliveDoc::checkDocumentClips(QDomNodeList infoproducers)
{
- int clipType;
- QDomElement e;
- QString id;
- QString resource;
- QList <QDomElement> missingClips;
- for (int i = 0; i < infoproducers.count(); i++) {
- e = infoproducers.item(i).toElement();
- clipType = e.attribute("type").toInt();
- if (clipType == TEXT || clipType == COLOR) continue;
- id = e.attribute("id");
- resource = e.attribute("resource");
- if (clipType == SLIDESHOW) resource = KUrl(resource).directory();
- if (!KIO::NetAccess::exists(KUrl(resource), KIO::NetAccess::SourceSide, 0)) {
- // Missing clip found
- missingClips.append(e);
+ DocumentChecker d(infoproducers, m_document);
+ return (d.hasMissingClips() == false);
+
+ /* int clipType;
+ QDomElement e;
+ QString id;
+ QString resource;
+ QList <QDomElement> missingClips;
+ for (int i = 0; i < infoproducers.count(); i++) {
+ e = infoproducers.item(i).toElement();
+ clipType = e.attribute("type").toInt();
+ if (clipType == COLOR) continue;
+ if (clipType == TEXT) {
+ //TODO: Check is clip template is missing (xmltemplate) or hash changed
+ continue;
+ }
+ id = e.attribute("id");
+ resource = e.attribute("resource");
+ if (clipType == SLIDESHOW) resource = KUrl(resource).directory();
+ if (!KIO::NetAccess::exists(KUrl(resource), KIO::NetAccess::SourceSide, 0)) {
+ // Missing clip found
+ missingClips.append(e);
+ } else {
+ // Check if the clip has changed
+ if (clipType != SLIDESHOW && e.hasAttribute("file_hash")) {
+ if (e.attribute("file_hash") != DocClipBase::getHash(e.attribute("resource")))
+ e.removeAttribute("file_hash");
+ }
+ }
}
- }
- if (missingClips.isEmpty()) return true;
- DocumentChecker d(missingClips, m_document);
- return (d.exec() == QDialog::Accepted);
+ if (missingClips.isEmpty()) return true;
+ DocumentChecker d(missingClips, m_document);
+ return (d.exec() == QDialog::Accepted);*/
}
void KdenliveDoc::setDocumentProperty(const QString &name, const QString &value)