#include "kdenlivesettings.h"
#include "renderer.h"
#include "clipmanager.h"
-#include "titlewidget.h"
+#include "widgets/titlewidget.h"
#include "mainwindow.h"
#include "documentchecker.h"
#include "documentvalidator.h"
#include <KStandardDirs>
#include <KMessageBox>
#include <KProgressDialog>
-#include <KLocale>
+#include <KLocalizedString>
#include <KFileDialog>
#include <KIO/NetAccess>
#include <KIO/CopyJob>
#include <QFile>
#include <QInputDialog>
#include <QDomImplementation>
+#include <QUndoGroup>
+#include <QTimer>
+#include <QUndoStack>
#include <mlt++/Mlt.h>
systemLocale.setNumberOptions(QLocale::OmitGroupSeparator);
QLocale::setDefault(systemLocale);
// locale conversion might need to be redone
- initEffects::parseEffectFiles(setlocale(LC_NUMERIC, NULL));
+ initEffects::parseEffectFiles(setlocale(LC_NUMERIC, NULL));
}
*openBackup = false;
else {
QFile file(tmpFile);
QString errorMsg;
- int line;
- int col;
+ int line;
+ int col;
QDomImplementation::setInvalidDataPolicy(QDomImplementation::DropInvalidChars);
success = m_document.setContent(&file, false, &errorMsg, &line, &col);
- file.close();
+ file.close();
if (!success) {
// It is corrupted
- int answer = KMessageBox::warningYesNoCancel (parent, i18n("Cannot open the project file, error is:\n%1 (line %2, col %3)\nDo you want to open a backup file?", errorMsg, line, col), i18n("Error opening file"), KGuiItem(i18n("Open Backup")), KGuiItem(i18n("Recover")));
+ int answer = KMessageBox::warningYesNoCancel (parent, i18n("Cannot open the project file, error is:\n%1 (line %2, col %3)\nDo you want to open a backup file?", errorMsg, line, col), i18n("Error opening file"), KGuiItem(i18n("Open Backup")), KGuiItem(i18n("Recover")));
if (answer == KMessageBox::Yes) {
- *openBackup = true;
- }
- else if (answer == KMessageBox::No) {
- // Try to recover broken file produced by Kdenlive 0.9.4
- if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
- int correction = 0;
- QString playlist = file.readAll();
- while (!success && correction < 2) {
- int errorPos = 0;
- line--;
- col = col - 2;
- for (int j = 0; j < line && errorPos < playlist.length(); j++) {
- errorPos = playlist.indexOf("\n", errorPos);
- errorPos++;
- }
- errorPos += col;
- if (errorPos >= playlist.length()) break;
- playlist.remove(errorPos, 1);
- line = 0;
- col = 0;
- success = m_document.setContent(playlist, false, &errorMsg, &line, &col);
- correction++;
- }
- if (!success) {
- KMessageBox::sorry(parent, i18n("Cannot recover this project file"));
- }
- else {
- // Document was modified, ask for backup
- QDomElement mlt = m_document.documentElement();
- QDomElement info = mlt.firstChildElement("kdenlivedoc");
- if (!info.isNull()) info.setAttribute("modified", 1);
- }
- }
- }
+ *openBackup = true;
+ }
+ else if (answer == KMessageBox::No) {
+ // Try to recover broken file produced by Kdenlive 0.9.4
+ if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+ int correction = 0;
+ QString playlist = file.readAll();
+ while (!success && correction < 2) {
+ int errorPos = 0;
+ line--;
+ col = col - 2;
+ for (int j = 0; j < line && errorPos < playlist.length(); j++) {
+ errorPos = playlist.indexOf("\n", errorPos);
+ errorPos++;
+ }
+ errorPos += col;
+ if (errorPos >= playlist.length()) break;
+ playlist.remove(errorPos, 1);
+ line = 0;
+ col = 0;
+ success = m_document.setContent(playlist, false, &errorMsg, &line, &col);
+ correction++;
+ }
+ if (!success) {
+ KMessageBox::sorry(parent, i18n("Cannot recover this project file"));
+ }
+ else {
+ // Document was modified, ask for backup
+ QDomElement mlt = m_document.documentElement();
+ QDomElement info = mlt.firstChildElement("kdenlivedoc");
+ if (!info.isNull()) info.setAttribute("modified", 1);
+ }
+ }
+ }
}
if (success) {
parent->slotGotProgressInfo(i18n("Validating"), 0);
if (e.tagName() == "trackinfo") {
TrackInfo projectTrack;
if (e.attribute("type") == "audio")
- projectTrack.type = AUDIOTRACK;
+ projectTrack.type = AudioTrack;
else
- projectTrack.type = VIDEOTRACK;
+ 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");
- projectTrack.effectsList = EffectsList(true);
+ projectTrack.effectsList = EffectsList(true);
m_tracksList.append(projectTrack);
}
}
for (int k = 0; k < maxchild; k++) {
e = markerslist.at(k).toElement();
if (e.tagName() == "marker") {
- CommentedTime marker(GenTime(e.attribute("time").toDouble()), e.attribute("comment"), e.attribute("type").toInt());
- DocClipBase *baseClip = m_clipManager->getClipById(e.attribute("id"));
+ CommentedTime marker(GenTime(e.attribute("time").toDouble()), e.attribute("comment"), e.attribute("type").toInt());
+ DocClipBase *baseClip = m_clipManager->getClipById(e.attribute("id"));
if (baseClip) baseClip->addSnapMarker(marker);
- else kDebug()<< " / / Warning, missing clip: "<< e.attribute("id");
- }
+ else kDebug()<< " / / Warning, missing clip: "<< e.attribute("id");
+ }
}
infoXml.removeChild(markers);
}
// Better default names for tracks: Audio 1 etc. instead of blank numbers
for (int i = 0; i < audiotracks; ++i) {
TrackInfo audioTrack;
- audioTrack.type = AUDIOTRACK;
+ audioTrack.type = AudioTrack;
audioTrack.isMute = false;
audioTrack.isBlind = true;
audioTrack.isLocked = false;
audioTrack.trackName = QString("Audio ") + QString::number(audiotracks - i);
audioTrack.duration = 0;
- audioTrack.effectsList = EffectsList(true);
+ audioTrack.effectsList = EffectsList(true);
m_tracksList.append(audioTrack);
}
for (int i = 0; i < videotracks; ++i) {
TrackInfo videoTrack;
- videoTrack.type = VIDEOTRACK;
+ videoTrack.type = VideoTrack;
videoTrack.isMute = false;
videoTrack.isBlind = false;
videoTrack.isLocked = false;
videoTrack.trackName = QString("Video ") + QString::number(videotracks - i);
videoTrack.duration = 0;
- videoTrack.effectsList = EffectsList(true);
+ videoTrack.effectsList = EffectsList(true);
m_tracksList.append(videoTrack);
}
return createEmptyDocument(m_tracksList);
}
-QDomDocument KdenliveDoc::createEmptyDocument(QList <TrackInfo> tracks)
+QDomDocument KdenliveDoc::createEmptyDocument(const QList <TrackInfo> &tracks)
{
// Creating new document
QDomDocument doc;
QDomElement tractor = doc.createElement("tractor");
tractor.setAttribute("id", "maintractor");
- QDomElement multitrack = doc.createElement("multitrack");
+ //QDomElement multitrack = doc.createElement("multitrack");
QDomElement playlist = doc.createElement("playlist");
playlist.setAttribute("id", "black_track");
mlt.appendChild(playlist);
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) {
+ if (tracks.at(i - 1).type == AudioTrack) {
track.setAttribute("hide", "video");
} else if (tracks.at(i - 1).isBlind)
track.setAttribute("hide", "video");
}
-void KdenliveDoc::syncGuides(QList <Guide *> guides)
+void KdenliveDoc::syncGuides(const QList <Guide *> &guides)
{
m_guidesXml.clear();
QDomElement guideNode = m_guidesXml.createElement("guides");
QDomElement tracksinfo = sceneList.createElement("tracksinfo");
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);
marker.setAttribute("time", marks.at(j).time().ms() / 1000);
marker.setAttribute("comment", marks.at(j).comment());
marker.setAttribute("id", e.attribute("id"));
- marker.setAttribute("type", marks.at(j).markerType());
+ marker.setAttribute("type", marks.at(j).markerType());
markers.appendChild(marker);
}
}
if (!autosave) {
cleanupBackupFiles();
QFileInfo info(file);
- QString fileName = KUrl(path).fileName().section('.', 0, -2);
+ QString fileName = KUrl(path).fileName().section('.', 0, -2);
fileName.append('-' + m_documentProperties.value("documentid"));
fileName.append(info.lastModified().toString("-yyyy-MM-dd-hh-mm"));
fileName.append(".kdenlive.png");
KStandardDirs::makeDir(url.path());
KStandardDirs::makeDir(url.path(KUrl::AddTrailingSlash) + "titles/");
KStandardDirs::makeDir(url.path(KUrl::AddTrailingSlash) + "thumbs/");
+ KStandardDirs::makeDir(url.path(KUrl::AddTrailingSlash) + "proxy/");
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?", m_projectFolder.path(), url.path())) == KMessageBox::Yes) moveProjectData(url);
m_projectFolder = url;
updateProjectFolderPlacesEntry();
}
-void KdenliveDoc::moveProjectData(KUrl url)
+void KdenliveDoc::moveProjectData(const KUrl &url)
{
QList <DocClipBase*> list = m_clipManager->documentClipList();
KUrl::List cacheUrls;
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(KUrl::AddTrailingSlash) + "titles/" + oldUrl.fileName());
}
QString hash = clip->getClipHash();
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)) {
cacheUrls << oldVideoThumbUrl;
}
+ KUrl oldAudioThumbUrl = KUrl(m_projectFolder.path(KUrl::AddTrailingSlash) + "thumbs/" + hash + ".thumb");
if (KIO::NetAccess::exists(oldAudioThumbUrl, KIO::NetAccess::SourceSide, 0)) {
cacheUrls << oldAudioThumbUrl;
}
+ KUrl oldVideoProxyUrl = KUrl(m_projectFolder.path(KUrl::AddTrailingSlash) + "proxy/" + hash + '.' + KdenliveSettings::proxyextension());
+ if (KIO::NetAccess::exists(oldVideoProxyUrl, KIO::NetAccess::SourceSide, 0)) {
+ cacheUrls << oldVideoProxyUrl;
+ }
}
if (!cacheUrls.isEmpty()) {
KIO::Job *job = KIO::copy(cacheUrls, KUrl(url.path(KUrl::AddTrailingSlash) + "thumbs/"));
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 = QLatin1String("dv_pal");
m_profile = ProfilesDialog::getVideoProfile(path);
double current_fps = m_fps;
if (m_profile.path.isEmpty()) {
emit updateClipDisplay(id);
}
-int KdenliveDoc::getFramePos(QString duration)
+int KdenliveDoc::getFramePos(const QString &duration)
{
return m_timecode.getFrameCount(duration);
}
return m_url;
}
-void KdenliveDoc::setUrl(KUrl url)
+void KdenliveDoc::setUrl(const KUrl &url)
{
m_url = url;
}
return m_url.fileName() + " / " + m_profile.description;
}
-bool KdenliveDoc::addClip(QDomElement elem, QString clipId, bool createClipItem)
+bool KdenliveDoc::addClip(QDomElement elem, const QString &clipId, bool createClipItem)
{
const QString producerId = clipId.section('_', 0, 0);
DocClipBase *clip = m_clipManager->getClipById(producerId);
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();
}
if (elem.hasAttribute("_missingsource")) {
// Clip has proxy but missing original source
}
- else if (path.isEmpty() == false && QFile::exists(path) == false && elem.attribute("type").toInt() != TEXT && !elem.hasAttribute("placeholder")) {
+ else 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");
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 (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));
elem.setAttribute("placeholder", '1');
}
if (!newpath.isEmpty()) {
- if (elem.attribute("type").toInt() == SLIDESHOW)
+ kDebug() << "// NEW CLIP PATH FOR CLIP " << clipId << " : " << newpath;
+ if (elem.attribute("type").toInt() == SlideShow)
newpath.append('/' + extension);
elem.setAttribute("resource", newpath);
setNewClipResource(clipId, newpath);
fileHash = QCryptographicHash::hash(fileData, QCryptographicHash::Md5);
if (QString(fileHash.toHex()) == matchHash)
return file.fileName();
+ else
+ kDebug() << filesAndDirs.at(i) << "size match but not hash";
}
}
- kDebug() << filesAndDirs.at(i) << file.size() << fileHash.toHex();
+ //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) {
return foundFileName;
}
-bool KdenliveDoc::addClipInfo(QDomElement elem, QDomElement orig, QString clipId)
+bool KdenliveDoc::addClipInfo(QDomElement elem, QDomElement orig, const QString &clipId)
{
DocClipBase *clip = m_clipManager->getClipById(clipId);
if (clip == NULL) {
QDomNamedNodeMap attributes = elem.attributes();
for (int i = 0; i < attributes.count(); ++i) {
QString attrname = attributes.item(i).nodeName();
- if (attrname != "resource")
+ if (attrname != "resource")
properties.insert(attrname, attributes.item(i).nodeValue());
//kDebug() << attrname << " = " << attributes.item(i).nodeValue();
}
for (QDomNode m = orig.firstChild(); !m.isNull(); m = m.nextSibling()) {
QString name = m.toElement().attribute("name");
if (name.startsWith("meta.attr")) {
- if (name.endsWith(".markup")) name = name.section('.', 0, -2);
+ if (name.endsWith(".markup")) name = name.section('.', 0, -2);
meta.insert(name.section('.', 2, -1), m.firstChild().nodeValue());
- }
+ }
}
if (!meta.isEmpty()) {
if (clip == NULL)
emit signalDeleteProjectClip(clipId);
}
-void KdenliveDoc::slotAddClipList(const KUrl::List urls, stringMap data)
+void KdenliveDoc::slotAddClipList(const KUrl::List &urls, const stringMap &data)
{
m_clipManager->slotAddClipList(urls, data);
//emit selectLastAddedClip(QString::number(m_clipManager->lastClipId()));
}
-void KdenliveDoc::slotAddClipFile(const KUrl &url, stringMap data)
+void KdenliveDoc::slotAddClipFile(const KUrl &url, const stringMap &data)
{
m_clipManager->slotAddClipFile(url, data);
emit selectLastAddedClip(QString::number(m_clipManager->lastClipId()));
return m_clipManager->getClipById(clipId);
}
-void KdenliveDoc::slotCreateXmlClip(const QString &name, const QDomElement xml, QString group, const QString &groupId)
+void KdenliveDoc::slotCreateXmlClip(const QString &name, const QDomElement &xml, const QString &group, const QString &groupId)
{
m_clipManager->slotAddXmlClipFile(name, xml, group, groupId);
setModified(true);
emit selectLastAddedClip(QString::number(m_clipManager->lastClipId()));
}
-void KdenliveDoc::slotCreateColorClip(const QString &name, const QString &color, const QString &duration, QString group, const QString &groupId)
+void KdenliveDoc::slotCreateColorClip(const QString &name, const QString &color, const QString &duration, const 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(QMap <QString, QString> properties, QString group, const QString &groupId)
+void KdenliveDoc::slotCreateSlideshowClipFile(const QMap <QString, QString> &properties, const QString &group, const QString &groupId)
{
m_clipManager->slotAddSlideshowClipFile(properties, group, groupId);
setModified(true);
delete dia_ui;
}
-void KdenliveDoc::slotCreateTextTemplateClip(QString group, const QString &groupId, KUrl path)
+void KdenliveDoc::slotCreateTextTemplateClip(const QString &group, const QString &groupId, KUrl path)
{
QString titlesFolder = projectFolder().path(KUrl::AddTrailingSlash) + "titles/";
if (path.isEmpty()) {
int KdenliveDoc::trackDuration(int ix)
{
- return m_tracksList.at(ix).duration;
+ return m_tracksList.at(ix).duration;
}
void KdenliveDoc::setTrackDuration(int ix, int duration)
m_tracksList[ix].duration = duration;
}
-void KdenliveDoc::insertTrack(int ix, TrackInfo type)
+void KdenliveDoc::insertTrack(int ix, const TrackInfo &type)
{
if (ix == -1) m_tracksList << type;
else m_tracksList.insert(ix, type);
m_tracksList.removeAt(ix);
}
-void KdenliveDoc::setTrackType(int ix, TrackInfo type)
+void KdenliveDoc::setTrackType(int ix, const TrackInfo &type)
{
if (ix < 0 || ix >= m_tracksList.count()) {
kWarning() << "SET Track Type outisde of range";
int audio = 0;
int video = 0;
foreach(const TrackInfo & info, m_tracksList) {
- if (info.type == VIDEOTRACK) video++;
+ if (info.type == VideoTrack) video++;
else audio++;
}
return QPoint(video, audio);
m_tracksList[ix].effectsList.append(effect);
}
-void KdenliveDoc::removeTrackEffect(int ix, QDomElement effect)
+void KdenliveDoc::removeTrackEffect(int ix, const QDomElement &effect)
{
if (ix < 0 || ix >= m_tracksList.count()) {
kWarning() << "Remove Track effect outisde of range";
//m_tracksList[trackIndex].effectsList.updateEffect(effect);
}
-void KdenliveDoc::enableTrackEffects(int trackIndex, QList <int> effectIndexes, bool disable)
+void KdenliveDoc::enableTrackEffects(int trackIndex, const QList <int> &effectIndexes, bool disable)
{
if (trackIndex < 0 || trackIndex >= m_tracksList.count()) {
kWarning() << "Set Track effect outisde of range";
EffectsList list = m_tracksList.at(trackIndex).effectsList;
QDomElement effect;
for (int i = 0; i < effectIndexes.count(); ++i) {
- effect = list.itemFromIndex(effectIndexes.at(i));
- if (!effect.isNull()) effect.setAttribute("disable", (int) disable);
+ effect = list.itemFromIndex(effectIndexes.at(i));
+ if (!effect.isNull()) effect.setAttribute("disable", (int) disable);
}
}
return list.hasEffect(tag, id);
}
-bool KdenliveDoc::saveCustomEffects(QDomNodeList customeffects)
+bool KdenliveDoc::saveCustomEffects(const QDomNodeList &customeffects)
{
QDomElement e;
QStringList importedEffects;
int maxchild = customeffects.count();
for (int i = 0; i < maxchild; ++i) {
e = customeffects.at(i).toElement();
- QString id = e.attribute("id");
- QString tag = e.attribute("tag");
+ const QString id = e.attribute("id");
+ const QString tag = e.attribute("tag");
if (!id.isEmpty()) {
// Check if effect exists or save it
if (MainWindow::customEffects.hasEffect(tag, id) == -1) {
}
}
}
- if (!importedEffects.isEmpty()) KMessageBox::informationList(kapp->activeWindow(), i18n("The following effects were imported from the project:"), importedEffects);
+ if (!importedEffects.isEmpty())
+ KMessageBox::informationList(kapp->activeWindow(), i18n("The following effects were imported from the project:"), importedEffects);
return (!importedEffects.isEmpty());
}
if (!QFile::copy(path, backupFile.path())) {
KMessageBox::information(kapp->activeWindow(), i18n("Cannot create backup copy:\n%1", backupFile.path()));
}
- }
+ }
}
void KdenliveDoc::cleanupBackupFiles()
for (int i = 0; i < hourList.count(); i += step) {
kDebug()<<"REMOVE AT: "<<i<<", COUNT: "<<hourList.count();
hourList.removeAt(i);
- i--;
+ --i;
}
} else hourList.clear();
if (dayList.count() > 20) {
int step = dayList.count() / 10;
for (int i = 0; i < dayList.count(); i += step) {
dayList.removeAt(i);
- i--;
+ --i;
}
} else dayList.clear();
if (weekList.count() > 20) {
int step = weekList.count() / 10;
for (int i = 0; i < weekList.count(); i += step) {
weekList.removeAt(i);
- i--;
+ --i;
}
} else weekList.clear();
if (oldList.count() > 20) {
int step = oldList.count() / 10;
for (int i = 0; i < oldList.count(); i += step) {
oldList.removeAt(i);
- i--;
+ --i;
}
} else oldList.clear();