X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftrackview.cpp;h=9d8f42b39389776d1692bb2ee3392ebd0b673464;hb=8e514e8841c1a6dfd0f5ae42188f5612035d0d90;hp=bdc09307969a7d657805be1810fe33295bda1452;hpb=9cebbfefb3320c9ff001ac3005b6ad33d1e4fcfd;p=kdenlive diff --git a/src/trackview.cpp b/src/trackview.cpp index bdc09307..9d8f42b3 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,8 +31,17 @@ #include "customtrackview.h" #include "initeffects.h" -TrackView::TrackView(KdenliveDoc *doc, QWidget *parent) - : QWidget(parent), m_doc(doc), m_scale(1.0), m_projectTracks(0) { +#include +#include + +#include + +TrackView::TrackView(KdenliveDoc *doc, QWidget *parent) : + QWidget(parent), + m_scale(1.0), + m_projectTracks(0), + m_doc(doc) +{ view = new Ui::TimeLine_UI(); view->setupUi(this); @@ -78,55 +82,67 @@ 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()); } -int TrackView::duration() const { +int TrackView::duration() const +{ return m_trackview->duration(); } -int TrackView::tracksNumber() const { +int TrackView::tracksNumber() const +{ return m_projectTracks - 1; } -int TrackView::inPoint() const { +int TrackView::inPoint() const +{ return m_ruler->inPoint(); } -int TrackView::outPoint() const { +int TrackView::outPoint() const +{ return m_ruler->outPoint(); } -void TrackView::slotSetZone(QPoint p) { +void TrackView::slotSetZone(QPoint p) +{ m_ruler->setZone(p); } -void TrackView::slotTransitionItemSelected(Transition *t, bool update) { +void TrackView::slotTransitionItemSelected(Transition *t, bool update) +{ emit transitionItemSelected(t, update); } -void TrackView::setDuration(int dur) { +void TrackView::setDuration(int dur) +{ m_trackview->setDuration(dur); m_ruler->setDuration(dur); } -void TrackView::parseDocument(QDomDocument doc) { - int cursorPos = 0; - m_documentErrors = QString(); - // kDebug() << "//// DOCUMENT: " << doc.toString(); +void TrackView::parseDocument(QDomDocument doc) +{ + //int cursorPos = 0; + m_documentErrors.clear(); + + //kDebug() << "//// DOCUMENT: " << doc.toString(); /*QDomNode props = doc.elementsByTagName("properties").item(0); if (!props.isNull()) { cursorPos = props.toElement().attribute("timeline_position").toInt(); }*/ // parse project tracks + QDomElement tractor = doc.elementsByTagName("tractor").item(0).toElement(); QDomNodeList tracks = doc.elementsByTagName("track"); QDomNodeList playlists = doc.elementsByTagName("playlist"); int duration = 300; @@ -136,7 +152,40 @@ void TrackView::parseDocument(QDomDocument doc) { QDomElement p; int pos = m_projectTracks - 1; - + m_invalidProducers.clear(); + QDomNodeList producers = doc.elementsByTagName("producer"); + for (int i = 0; i < producers.count(); i++) { + // Check for invalid producers + QDomNode n = producers.item(i); + e = n.toElement(); + + /* + // Check for invalid markup + QDomNodeList params = e.elementsByTagName("property"); + for (int j = 0; j < params.count(); j++) { + QDomElement p = params.item(j).toElement(); + if (p.attribute("name") == "markup") { + QString val = p.text().toUtf8().data(); + kDebug()<<"//FOUND MARKUP, VAL: "< out || in == out) { + // invalid producer, remove it + QString id = e.attribute("id"); + m_invalidProducers.append(id); + m_documentErrors.append(i18n("Invalid clip producer %1\n", id)); + doc.documentElement().removeChild(producers.at(i)); + i--; + } + } for (int i = 0; i < m_projectTracks; i++) { e = tracks.item(i).toElement(); @@ -148,6 +197,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") { @@ -156,7 +208,8 @@ 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; @@ -176,9 +229,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; @@ -211,8 +264,7 @@ void TrackView::parseDocument(QDomDocument doc) { QString transitionId; if (mlt_service == "composite") { // When adding composite transition, check if it is a wipe transition - if (mlt_geometry == "0%,0%:100%x100%") transitionId = "alphatransparency"; - else if (mlt_geometry.count(';') == 1) { + if (mlt_geometry.count(';') == 1) { mlt_geometry.remove(QChar('%'), Qt::CaseInsensitive); mlt_geometry.replace(QChar('x'), QChar(','), Qt::CaseInsensitive); QString start = mlt_geometry.section(';', 0, 0); @@ -269,9 +321,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 (b_track > 0 && m_doc->isTrackLocked(b_track - 1)) { + tr->setItemLocked(true); + } + } } } @@ -284,6 +347,10 @@ void TrackView::parseDocument(QDomDocument doc) { m_trackview->addGuide(pos, comment); } + // Rebuild groups + QDomNodeList groups = doc.elementsByTagName("group"); + m_trackview->loadGroups(groups); + m_trackview->setDuration(duration); kDebug() << "/////////// TOTAL PROJECT DURATION: " << duration; slotRebuildTrackHeaders(); @@ -292,26 +359,31 @@ void TrackView::parseDocument(QDomDocument doc) { //m_scrollBox->setGeometry(0, 0, 300 * zoomFactor(), m_scrollArea->height()); } -void TrackView::slotDeleteClip(const QString &clipId) { +void TrackView::slotDeleteClip(const QString &clipId) +{ m_trackview->deleteClip(clipId); } -void TrackView::setCursorPos(int pos) { +void TrackView::setCursorPos(int pos) +{ m_trackview->setCursorPos(pos); } -void TrackView::moveCursorPos(int pos) { +void TrackView::moveCursorPos(int pos) +{ m_trackview->setCursorPos(pos, false); } -void TrackView::slotChangeZoom(int factor) { +void TrackView::slotChangeZoom(int factor) +{ m_doc->setZoom(factor); m_ruler->setPixelPerMark(factor); m_scale = (double) FRAME_SIZE / m_ruler->comboScale[factor]; // m_ruler->comboScale[m_currentZoom] / m_trackview->setScale(m_scale); } -int TrackView::fitZoom() const { +int TrackView::fitZoom() const +{ int zoom = (int)((duration() + 20 / m_scale) * FRAME_SIZE / m_trackview->width()); int i; for (i = 0; i < 13; i++) @@ -319,25 +391,20 @@ int TrackView::fitZoom() const { return i; } -const double TrackView::zoomFactor() const { - return m_scale; -} - -const int TrackView::mapLocalToValue(int x) const { - return (int)(x * zoomFactor()); -} - -KdenliveDoc *TrackView::document() { +KdenliveDoc *TrackView::document() +{ return m_doc; } -void TrackView::refresh() { +void TrackView::refresh() +{ m_trackview->viewport()->update(); } -void TrackView::slotRebuildTrackHeaders() { +void TrackView::slotRebuildTrackHeaders() +{ QList list = m_doc->tracksList(); - QList widgets = this->findChildren(); + QList widgets = findChildren(); for (int i = 0; i < widgets.count(); i++) delete widgets.at(i); int max = list.count(); @@ -345,6 +412,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))); @@ -355,11 +423,13 @@ void TrackView::slotRebuildTrackHeaders() { } -int TrackView::slotAddProjectTrack(int ix, QDomElement xml) { - int trackTop = KdenliveSettings::trackheight() * ix; +int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked) +{ // parse track int position = 0; - for (QDomNode n = xml.firstChild(); !n.isNull(); n = n.nextSibling()) { + QDomNodeList children = xml.childNodes(); + for (int nodeindex = 0; nodeindex < children.count(); nodeindex++) { + QDomNode n = children.item(nodeindex); QDomElement elem = n.toElement(); if (elem.tagName() == "blank") { position += elem.attribute("length").toInt(); @@ -368,28 +438,33 @@ 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_invalidProducers.contains(elem.attribute("producer"))) { + m_documentErrors.append(i18n("Invalid clip removed from track %1 at %2\n", ix, position)); + xml.removeChild(children.at(nodeindex)); + nodeindex--; + 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); + if (idString.endsWith("_video")) item->setVideoOnly(true); + else if (idString.endsWith("_audio")) item->setAudioOnly(true); m_scene->addItem(item); + if (locked) item->setItemLocked(true); clip->addReference(); position += (out - in + 1); @@ -442,7 +517,7 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml) { if (MainWindow::videoEffects.hasKeyFrames(currenteffect)) { //kDebug() << " * * * * * * * * * * ** CLIP EFF WITH KFR FND * * * * * * * * * * *"; // effect is key-framable, read all effects to retrieve keyframes - double factor; + double factor = 0; QString starttag; QString endtag; QDomNodeList params = currenteffect.elementsByTagName("parameter"); @@ -458,8 +533,8 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml) { QString keyframes; int effectin = effect.attribute("in").toInt(); int effectout = effect.attribute("out").toInt(); - double startvalue; - double endvalue; + double startvalue = 0; + double endvalue = 0; for (QDomNode n3 = effect.firstChild(); !n3.isNull(); n3 = n3.nextSibling()) { // parse effect parameters QDomElement effectparam = n3.toElement(); @@ -469,7 +544,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); @@ -494,7 +569,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++; } } @@ -552,7 +627,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); } } @@ -560,27 +667,72 @@ 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(); } -QGraphicsScene *TrackView::projectScene() { +DocClipBase *TrackView::getMissingProducer(const QString id) const +{ + QDomElement missingXml; + 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; } -CustomTrackView *TrackView::projectView() { +CustomTrackView *TrackView::projectView() +{ return m_trackview; } -void TrackView::setEditMode(const QString & editMode) { +void TrackView::setEditMode(const QString & editMode) +{ m_editMode = editMode; } -const QString & TrackView::editMode() const { +const QString & TrackView::editMode() const +{ return m_editMode; } +void TrackView::slotChangeTrackLock(int ix, bool lock) +{ + QList widgets = findChildren(); + widgets.at(ix)->setLock(lock); +} #include "trackview.moc"