X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftrackview.cpp;h=72cf2823ec818a2f22f0b9796f78697fb7d911e5;hb=4664de14c0240086ced95c4ff9e4c1101a60051d;hp=7535509648aa32002bc37f99b9964ed604d2b85f;hpb=c5720a8894dd5a0dbd06f3330299dc669454fa06;p=kdenlive diff --git a/src/trackview.cpp b/src/trackview.cpp index 75355096..72cf2823 100644 --- a/src/trackview.cpp +++ b/src/trackview.cpp @@ -18,14 +18,9 @@ ***************************************************************************/ -#include - -#include -#include - +#include "trackview.h" #include "definitions.h" #include "headertrack.h" -#include "trackview.h" #include "clipitem.h" #include "transition.h" #include "kdenlivesettings.h" @@ -36,6 +31,11 @@ #include "customtrackview.h" #include "initeffects.h" +#include +#include + +#include + TrackView::TrackView(KdenliveDoc *doc, QWidget *parent) : QWidget(parent), m_doc(doc), m_scale(1.0), m_projectTracks(0) { @@ -78,12 +78,15 @@ TrackView::TrackView(KdenliveDoc *doc, QWidget *parent) connect(m_trackview, SIGNAL(trackHeightChanged()), this, SLOT(slotRebuildTrackHeaders())); parseDocument(m_doc->toXml()); - + m_doc->setSceneList(); connect(m_trackview, SIGNAL(cursorMoved(int, int)), m_ruler, SLOT(slotCursorMoved(int, int))); connect(m_trackview->horizontalScrollBar(), SIGNAL(valueChanged(int)), m_ruler, SLOT(slotMoveRuler(int))); connect(m_trackview, SIGNAL(mousePosition(int)), this, SIGNAL(mousePosition(int))); connect(m_trackview, SIGNAL(transitionItemSelected(Transition*, bool)), this, SLOT(slotTransitionItemSelected(Transition*, bool))); + connect(m_trackview, SIGNAL(doTrackLock(int, bool)), this, SLOT(slotChangeTrackLock(int, bool))); + slotChangeZoom(m_doc->zoom()); + slotSetZone(m_doc->zone()); } @@ -118,7 +121,7 @@ void TrackView::setDuration(int dur) { void TrackView::parseDocument(QDomDocument doc) { int cursorPos = 0; - m_documentErrors = QString(); + m_documentErrors.clear(); // kDebug() << "//// DOCUMENT: " << doc.toString(); /*QDomNode props = doc.elementsByTagName("properties").item(0); if (!props.isNull()) { @@ -126,6 +129,7 @@ void TrackView::parseDocument(QDomDocument doc) { }*/ // parse project tracks + QDomElement tractor = doc.elementsByTagName("tractor").item(0).toElement(); QDomNodeList tracks = doc.elementsByTagName("track"); QDomNodeList playlists = doc.elementsByTagName("playlist"); int duration = 300; @@ -147,6 +151,9 @@ void TrackView::parseDocument(QDomDocument doc) { p = playlists.item(j).toElement(); if (p.attribute("id") == playlist_name) break; } + if (p.attribute("id") != playlist_name) { // then it didn't work. + kDebug() << "NO PLAYLIST FOUND FOR TRACK " + pos; + } if (e.attribute("hide") == "video") { m_doc->switchTrackVideo(i - 1, true); } else if (e.attribute("hide") == "audio") { @@ -155,7 +162,7 @@ void TrackView::parseDocument(QDomDocument doc) { m_doc->switchTrackVideo(i - 1, true); m_doc->switchTrackAudio(i - 1, true); } - trackduration = slotAddProjectTrack(pos, p); + trackduration = slotAddProjectTrack(pos, p, m_doc->isTrackLocked(i - 1)); pos--; //kDebug() << " PRO DUR: " << trackduration << ", TRACK DUR: " << duration; if (trackduration > duration) duration = trackduration; @@ -175,9 +182,9 @@ void TrackView::parseDocument(QDomDocument doc) { // parse transitions QDomNodeList transitions = doc.elementsByTagName("transition"); - int projectTransitions = transitions.count(); + //kDebug() << "//////////// TIMELINE FOUND: " << projectTransitions << " transitions"; - for (int i = 0; i < projectTransitions; i++) { + for (int i = 0; i < transitions.count(); i++) { e = transitions.item(i).toElement(); QDomNodeList transitionparams = e.childNodes(); bool transitionAdd = true; @@ -268,9 +275,20 @@ void TrackView::parseDocument(QDomDocument doc) { transitionInfo.endPos = GenTime(e.attribute("out").toInt() + 1, m_doc->fps()); transitionInfo.track = m_projectTracks - 1 - b_track; //kDebug() << "/////////////// +++++++++++ ADDING TRANSITION ON TRACK: " << b_track << ", TOTAL TRKA: " << m_projectTracks; - Transition *tr = new Transition(transitionInfo, a_track, m_doc->fps(), base, isAutomatic); - if (forceTrack) tr->setForcedTrack(true, a_track); - m_scene->addItem(tr); + if (transitionInfo.startPos >= transitionInfo.endPos) { + // invalid transition, remove it. + m_documentErrors.append(i18n("Removed invalid transition: %1", e.attribute("id")) + '\n'); + kDebug() << "///// REMOVED INVALID TRANSITION: " << e.attribute("id"); + tractor.removeChild(transitions.item(i)); + i--; + } else { + Transition *tr = new Transition(transitionInfo, a_track, m_doc->fps(), base, isAutomatic); + if (forceTrack) tr->setForcedTrack(true, a_track); + m_scene->addItem(tr); + if (m_doc->isTrackLocked(b_track - 1)) { + tr->setItemLocked(true); + } + } } } @@ -344,6 +362,7 @@ void TrackView::slotRebuildTrackHeaders() { HeaderTrack *header = new HeaderTrack(i, list.at(max - i - 1), this); connect(header, SIGNAL(switchTrackVideo(int)), m_trackview, SLOT(slotSwitchTrackVideo(int))); connect(header, SIGNAL(switchTrackAudio(int)), m_trackview, SLOT(slotSwitchTrackAudio(int))); + connect(header, SIGNAL(switchTrackLock(int)), m_trackview, SLOT(slotSwitchTrackLock(int))); connect(header, SIGNAL(deleteTrack(int)), this, SIGNAL(deleteTrack(int))); connect(header, SIGNAL(insertTrack(int)), this, SIGNAL(insertTrack(int))); @@ -354,7 +373,7 @@ void TrackView::slotRebuildTrackHeaders() { } -int TrackView::slotAddProjectTrack(int ix, QDomElement xml) { +int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked) { int trackTop = KdenliveSettings::trackheight() * ix; // parse track int position = 0; @@ -367,28 +386,29 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml) { qApp->processEvents(); // Found a clip int in = elem.attribute("in").toInt(); + int out = elem.attribute("out").toInt(); + if (in > out || in == out) { + m_documentErrors.append(i18n("Invalid clip removed from track %1 at %2\n", ix, position)); + continue; + } QString idString = elem.attribute("producer"); QString id = idString; - bool hasSpeedAttribute = false; - double speed; + double speed = 1.0; if (idString.startsWith("slowmotion")) { - hasSpeedAttribute = true; - id = idString.section(":", 1, 1); - speed = idString.section(":", 2, 2).toDouble(); + id = idString.section(':', 1, 1); + speed = idString.section(':', 2, 2).toDouble(); } else id = id.section('_', 0, 0); DocClipBase *clip = m_doc->clipManager()->getClipById(id); if (clip != NULL) { - int out = elem.attribute("out").toInt(); - ItemInfo clipinfo; clipinfo.startPos = GenTime(position, m_doc->fps()); clipinfo.endPos = clipinfo.startPos + GenTime(out - in + 1, m_doc->fps()); clipinfo.cropStart = GenTime(in, m_doc->fps()); clipinfo.track = ix; //kDebug() << "// INSERTING CLIP: " << in << "x" << out << ", track: " << ix << ", ID: " << id << ", SCALE: " << m_scale << ", FPS: " << m_doc->fps(); - ClipItem *item = new ClipItem(clip, clipinfo, m_doc->fps(), false); - if (hasSpeedAttribute) item->setSpeed(speed); + ClipItem *item = new ClipItem(clip, clipinfo, m_doc->fps(), speed, false); m_scene->addItem(item); + if (locked) item->setItemLocked(true); clip->addReference(); position += (out - in + 1); @@ -468,7 +488,7 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml) { endvalue = effectparam.text().toDouble() * factor; } // add first keyframe - keyframes.append(QString::number(effectin) + ":" + QString::number(startvalue) + ";" + QString::number(effectout) + ":" + QString::number(endvalue) + ";"); + keyframes.append(QString::number(effectin) + ':' + QString::number(startvalue) + ';' + QString::number(effectout) + ':' + QString::number(endvalue) + ';'); QDomNode lastParsedEffect; ix++; QDomNode n2 = effects.at(ix); @@ -493,7 +513,7 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml) { } } if (continueParsing) { - keyframes.append(QString::number(effectout) + ":" + QString::number(endvalue) + ";"); + keyframes.append(QString::number(effectout) + ':' + QString::number(endvalue) + ';'); ix++; } } @@ -551,7 +571,39 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml) { } } } - } else kWarning() << "CANNOT INSERT CLIP " << id; + } else { + // The clip in playlist was not listed in the kdenlive producers, + // something went wrong, repair required. + kWarning() << "CANNOT INSERT CLIP " << id; + int out = elem.attribute("out").toInt(); + + ItemInfo clipinfo; + clipinfo.startPos = GenTime(position, m_doc->fps()); + clipinfo.endPos = clipinfo.startPos + GenTime(out - in + 1, m_doc->fps()); + clipinfo.cropStart = GenTime(in, m_doc->fps()); + clipinfo.track = ix; + //kDebug() << "// INSERTING CLIP: " << in << "x" << out << ", track: " << ix << ", ID: " << id << ", SCALE: " << m_scale << ", FPS: " << m_doc->fps(); + + DocClipBase *missingClip = getMissingProducer(id); + if (!missingClip) { + // We cannot find the producer, something is really wrong, add + // placeholder color clip + QDomElement producerXml; + producerXml.setTagName("producer"); + producerXml.setAttribute("resource", "0xff0000ff"); + producerXml.setAttribute("mlt_service", "colour"); + producerXml.setAttribute("length", "15000"); + producerXml.setAttribute("id", id); + missingClip = new DocClipBase(m_doc->clipManager(), producerXml, id); + m_documentErrors.append(i18n("Boken clip producer %1", id) + '\n'); + } else m_documentErrors.append(i18n("Replaced wrong clip producer %1 with %2", id, missingClip->getId()) + '\n'); + ClipItem *item = new ClipItem(missingClip, clipinfo, m_doc->fps(), 1.0, false); + m_scene->addItem(item); + missingClip->addReference(); + position += (out - in + 1); + + m_doc->setModified(true); + } //m_clipList.append(clip); } } @@ -559,11 +611,46 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml) { //documentTracks.insert(ix, track); - kDebug() << "************* ADD DOC TRACK " << ix << ", DURATION: " << position; + kDebug() << "************* ADD DOC TRACK " << ix << ", DURATION: " << position; return position; //track->show(); } +DocClipBase *TrackView::getMissingProducer(const QString id) const { + QDomElement missingXml = QDomElement(); + QDomDocument doc = m_doc->toXml(); + QString docRoot = doc.documentElement().attribute("root"); + if (!docRoot.endsWith('/')) docRoot.append('/'); + QDomNodeList prods = doc.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) { + missingXml = m.toElement(); + break; + } + } + if (missingXml == QDomElement()) return NULL; + + QDomNodeList params = missingXml.childNodes(); + QString resource; + QString mlt_service; + for (int j = 0; j < params.count(); j++) { + QDomElement e = params.item(j).toElement(); + if (e.attribute("name") == "resource") { + resource = e.firstChild().nodeValue(); + } else if (e.attribute("name") == "mlt_service") { + mlt_service = e.firstChild().nodeValue(); + } + } + resource.prepend(docRoot); + DocClipBase *missingClip = NULL; + if (!resource.isEmpty()) + missingClip = m_doc->clipManager()->getClipByResource(resource); + return missingClip; +} + QGraphicsScene *TrackView::projectScene() { return m_scene; } @@ -580,6 +667,10 @@ const QString & TrackView::editMode() const { return m_editMode; } +void TrackView::slotChangeTrackLock(int ix, bool lock) { + QList widgets = this->findChildren(); + widgets.at(ix)->setLock(lock); +} #include "trackview.moc"