X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftrackview.cpp;h=98dd939291c042f8eeb6d1b8e7d03f6e3660d38f;hb=55582dfa34f62d6d5df3ba28606dee10a2d69d46;hp=d3fc28160f66a5bdcb7f88c6bf52ff3823802802;hpb=2cc32048a98e4f16b8f80ef0dea04aaee54bccb0;p=kdenlive diff --git a/src/trackview.cpp b/src/trackview.cpp index d3fc2816..98dd9392 100644 --- a/src/trackview.cpp +++ b/src/trackview.cpp @@ -18,11 +18,10 @@ ***************************************************************************/ -#include -#include #include #include +#include #include "definitions.h" #include "headertrack.h" @@ -36,19 +35,21 @@ #include "mainwindow.h" #include "customtrackview.h" + TrackView::TrackView(KdenliveDoc *doc, QWidget *parent) - : QWidget(parent), m_doc(doc), m_scale(1.0), m_projectTracks(0), m_currentZoom(4) { + : QWidget(parent), m_doc(doc), m_scale(1.0), m_projectTracks(0) { view = new Ui::TimeLine_UI(); view->setupUi(this); - m_scene = new QGraphicsScene(); + m_scene = new CustomTrackScene(doc); m_trackview = new CustomTrackView(doc, m_scene, parent); m_trackview->scale(1, 1); m_trackview->setAlignment(Qt::AlignLeft | Qt::AlignTop); //m_scene->addRect(QRectF(0, 0, 100, 100), QPen(), QBrush(Qt::red)); m_ruler = new CustomRuler(doc->timecode(), m_trackview); + connect(m_ruler, SIGNAL(zoneMoved(int, int)), this, SIGNAL(zoneMoved(int, int))); QHBoxLayout *layout = new QHBoxLayout; view->ruler_frame->setLayout(layout); int left_margin; @@ -76,19 +77,15 @@ TrackView::TrackView(KdenliveDoc *doc, QWidget *parent) connect(m_trackview->verticalScrollBar(), SIGNAL(valueChanged(int)), view->headers_area->verticalScrollBar(), SLOT(setValue(int))); connect(m_trackview, SIGNAL(trackHeightChanged()), this, SLOT(slotRebuildTrackHeaders())); - parseDocument(doc->toXml()); + parseDocument(m_doc->toXml()); 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(clipItemSelected(ClipItem*)), this, SLOT(slotClipItemSelected(ClipItem*))); connect(m_trackview, SIGNAL(transitionItemSelected(Transition*)), this, SLOT(slotTransitionItemSelected(Transition*))); - slotChangeZoom(m_currentZoom); + slotChangeZoom(m_doc->zoom()); } -int TrackView::currentZoom() const { - return m_currentZoom; -} int TrackView::duration() const { return m_trackview->duration(); @@ -106,8 +103,8 @@ int TrackView::outPoint() const { return m_ruler->outPoint(); } -void TrackView::slotClipItemSelected(ClipItem*c) { - emit clipItemSelected(c); +void TrackView::slotSetZone(QPoint p) { + m_ruler->setZone(p); } void TrackView::slotTransitionItemSelected(Transition *t) { @@ -121,7 +118,8 @@ void TrackView::setDuration(int dur) { void TrackView::parseDocument(QDomDocument doc) { int cursorPos = 0; - //kDebug() << "//// DOCUMENT: " << doc.toString(); + m_documentErrors = QString(); + // kDebug() << "//// DOCUMENT: " << doc.toString(); QDomNode props = doc.elementsByTagName("properties").item(0); if (!props.isNull()) { cursorPos = props.toElement().attribute("timeline_position").toInt(); @@ -136,8 +134,10 @@ void TrackView::parseDocument(QDomDocument doc) { QDomElement e; QDomElement p; bool videotrack; - kDebug() << "//////////// TIMELINE FOUND: " << m_projectTracks << " tracks"; + int pos = m_projectTracks - 1; + + for (int i = 0; i < m_projectTracks; i++) { e = tracks.item(i).toElement(); QString playlist_name = e.attribute("producer"); @@ -151,16 +151,26 @@ void TrackView::parseDocument(QDomDocument doc) { videotrack = (e.attribute("hide") != "video"); trackduration = slotAddProjectTrack(pos, p, videotrack); pos--; - kDebug() << " PRO DUR: " << trackduration << ", TRACK DUR: " << duration; + //kDebug() << " PRO DUR: " << trackduration << ", TRACK DUR: " << duration; if (trackduration > duration) duration = trackduration; - } else pos--; + } else { + // background black track + for (int j = 0; j < m_projectTracks; j++) { + p = playlists.item(j).toElement(); + if (p.attribute("id") == playlist_name) break; + } + int black_clips = p.childNodes().count(); + for (int i = 0; i < black_clips; i++) + m_doc->loadingProgressed(); + qApp->processEvents(); + pos--; + } } - // parse transitions QDomNodeList transitions = doc.elementsByTagName("transition"); int projectTransitions = transitions.count(); - kDebug() << "//////////// TIMELINE FOUND: " << projectTransitions << " transitions"; + //kDebug() << "//////////// TIMELINE FOUND: " << projectTransitions << " transitions"; for (int i = 0; i < projectTransitions; i++) { e = transitions.item(i).toElement(); QDomNodeList transitionparams = e.childNodes(); @@ -171,35 +181,77 @@ void TrackView::parseDocument(QDomDocument doc) { for (int k = 0; k < transitionparams.count(); k++) { p = transitionparams.item(k).toElement(); if (!p.isNull()) { + QString paramName = p.attribute("name"); // do not add audio mixing transitions - if (p.attribute("name") == "internal_added" && p.text() == "237") { + if (paramName == "internal_added" && p.text() == "237") { transitionAdd = false; - kDebug() << "// TRANSITRION " << i << " IS NOT VALID (INTERN ADDED)"; + //kDebug() << "// TRANSITRION " << i << " IS NOT VALID (INTERN ADDED)"; break; - } else if (p.attribute("name") == "a_track") a_track = p.text().toInt(); - else if (p.attribute("name") == "b_track") b_track = m_projectTracks - 1 - p.text().toInt(); - else if (p.attribute("name") == "mlt_service") mlt_service = p.text().toInt(); + } else if (paramName == "a_track") a_track = p.text().toInt(); + else if (paramName == "b_track") b_track = m_projectTracks - 1 - p.text().toInt(); + else if (paramName == "mlt_service") mlt_service = p.text(); } } if (transitionAdd) { // Transition should be added to the scene ItemInfo transitionInfo; + QDomElement base = MainWindow::transitions.getEffectByTag(mlt_service, QString()); + + for (int k = 0; k < transitionparams.count(); k++) { + p = transitionparams.item(k).toElement(); + if (!p.isNull()) { + QString paramName = p.attribute("name"); + QString paramValue = p.text(); + + QDomNodeList params = base.elementsByTagName("parameter"); + if (paramName != "a_track" && paramName != "b_track") for (int i = 0; i < params.count(); i++) { + QDomElement e = params.item(i).toElement(); + if (!e.isNull() && e.attribute("tag") == paramName) { + if (e.attribute("type") == "double") { + QString factor = e.attribute("factor", "1"); + if (factor != "1") { + double val = paramValue.toDouble() * factor.toDouble(); + paramValue = QString::number(val); + } + } + e.setAttribute("value", paramValue); + break; + } + } + } + } + + /*QDomDocument doc; + doc.appendChild(doc.importNode(base, true)); + kDebug() << "/////// TRANSITION XML: "<< doc.toString();*/ + transitionInfo.startPos = GenTime(e.attribute("in").toInt(), m_doc->fps()); transitionInfo.endPos = GenTime(e.attribute("out").toInt(), m_doc->fps()); transitionInfo.track = b_track; - Transition *tr = new Transition(transitionInfo, a_track, m_scale, m_doc->fps(), QDomElement()); + //kDebug() << "/////////////// +++++++++++ ADDING TRANSITION ON TRACK: " << b_track << ", TOTAL TRKA: " << m_projectTracks; + Transition *tr = new Transition(transitionInfo, a_track, m_doc->fps(), base); m_scene->addItem(tr); } } + // Add guides + QDomNodeList guides = doc.elementsByTagName("guide"); + for (int i = 0; i < guides.count(); i++) { + e = guides.item(i).toElement(); + const QString comment = e.attribute("comment"); + const GenTime pos = GenTime(e.attribute("time").toDouble()); + m_trackview->addGuide(pos, comment); + } m_trackview->setDuration(duration); + kDebug() << "/////////// TOTAL PROJECT DURATION: " << duration; slotRebuildTrackHeaders(); + if (!m_documentErrors.isNull()) KMessageBox::sorry(this, m_documentErrors); //m_trackview->setCursorPos(cursorPos); //m_scrollBox->setGeometry(0, 0, 300 * zoomFactor(), m_scrollArea->height()); } -void TrackView::slotDeleteClip(int clipId) { +void TrackView::slotDeleteClip(const QString &clipId) { m_trackview->deleteClip(clipId); } @@ -212,10 +264,9 @@ void TrackView::moveCursorPos(int pos) { } 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_currentZoom = factor; m_trackview->setScale(m_scale); } @@ -253,6 +304,10 @@ 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))); + /* + //TODO: re-enable when add / remove track is implemented + connect(header, SIGNAL(deleteTrack(int)), m_trackview, SLOT(slotDeleteTrack(int))); + connect(header, SIGNAL(insertTrack(int)), m_trackview, SLOT(slotInsertTrack(int)));*/ m_headersLayout->addWidget(header); } view->headers_container->adjustSize(); @@ -281,28 +336,44 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool videotrack) { if (elem.tagName() == "blank") { position += elem.attribute("length").toInt(); } else if (elem.tagName() == "entry") { + m_doc->loadingProgressed(); + qApp->processEvents(); // Found a clip int in = elem.attribute("in").toInt(); - int id = elem.attribute("producer").toInt(); + QString idString = elem.attribute("producer"); + QString id = idString; + bool hasSpeedAttribute = false; + double speed; + if (idString.startsWith("slowmotion")) { + hasSpeedAttribute = true; + id = idString.section(":", 1, 1); + speed = idString.section(":", 2, 2).toDouble(); + } 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 = GenTime(out, 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_scale, m_doc->fps()); + //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); m_scene->addItem(item); - position += out; + clip->addReference(); + position += (out - in + 1); // parse clip effects - for (QDomNode n2 = elem.firstChild(); !n2.isNull(); n2 = n2.nextSibling()) { - QDomElement effect = n2.toElement(); + QDomNodeList effects = elem.childNodes(); + for (int ix = 0; ix < effects.count(); ix++) { + QDomElement effect = effects.at(ix).toElement(); if (effect.tagName() == "filter") { + kDebug() << " * * * * * * * * * * ** CLIP EFF FND * * * * * * * * * * *"; // add effect to clip QString effecttag; + QString effectid; QString effectindex; // Get effect tag & index for (QDomNode n3 = effect.firstChild(); !n3.isNull(); n3 = n3.nextSibling()) { @@ -310,38 +381,116 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool videotrack) { QDomElement effectparam = n3.toElement(); if (effectparam.attribute("name") == "tag") { effecttag = effectparam.text(); - } - if (effectparam.attribute("name") == "kdenlive_ix") { + } else if (effectparam.attribute("name") == "kdenlive_id") { + effectid = effectparam.text(); + } else if (effectparam.attribute("name") == "kdenlive_ix") { effectindex = effectparam.text(); } } // get effect standard tags - QDomElement clipeffect = MainWindow::videoEffects.getEffectByTag(effecttag); - clipeffect.setAttribute("kdenlive_ix", effectindex); - QDomNodeList clipeffectparams = clipeffect.childNodes(); + QDomElement clipeffect = MainWindow::customEffects.getEffectByTag(QString(), effectid); + if (clipeffect.isNull()) clipeffect = MainWindow::videoEffects.getEffectByTag(effecttag, effectid); + if (clipeffect.isNull()) clipeffect = MainWindow::audioEffects.getEffectByTag(effecttag, effectid); + if (clipeffect.isNull()) { + kDebug() << "/// WARNING, EFFECT: " << effecttag << ": " << effectid << " not found, removing it from project"; + m_documentErrors.append(i18n("Effect %1:%2 not found in MLT, it was removed from this project\n", effecttag, effectid)); + elem.removeChild(effects.at(ix)); + ix--; + } else { + QDomElement currenteffect = clipeffect.cloneNode().toElement(); + currenteffect.setAttribute("kdenlive_ix", effectindex); + QDomNodeList clipeffectparams = currenteffect.childNodes(); + + if (MainWindow::videoEffects.hasKeyFrames(currenteffect)) { + kDebug() << " * * * * * * * * * * ** CLIP EFF WITH KFR FND * * * * * * * * * * *"; + // effect is key-framable, read all effects to retrieve keyframes + double factor; + QString starttag; + QString endtag; + QDomNodeList params = currenteffect.elementsByTagName("parameter"); + for (int i = 0; i < params.count(); i++) { + QDomElement e = params.item(i).toElement(); + if (e.attribute("type") == "keyframe") { + starttag = e.attribute("starttag", "start"); + endtag = e.attribute("endtag", "end"); + factor = e.attribute("factor", "1").toDouble(); + break; + } + } + QString keyframes; + int effectin = effect.attribute("in").toInt(); + int effectout = effect.attribute("out").toInt(); + double startvalue; + double endvalue; + for (QDomNode n3 = effect.firstChild(); !n3.isNull(); n3 = n3.nextSibling()) { + // parse effect parameters + QDomElement effectparam = n3.toElement(); + if (effectparam.attribute("name") == starttag) + startvalue = effectparam.text().toDouble() * factor; + if (effectparam.attribute("name") == endtag) + endvalue = effectparam.text().toDouble() * factor; + } + // add first keyframe + keyframes.append(QString::number(effectin) + ":" + QString::number(startvalue) + ";" + QString::number(effectout) + ":" + QString::number(endvalue) + ";"); + QDomNode lastParsedEffect; + ix++; + QDomNode n2 = effects.at(ix); + bool continueParsing = true; + for (; !n2.isNull() && continueParsing; n2 = n2.nextSibling()) { + // parse all effects + QDomElement kfreffect = n2.toElement(); + int effectout = kfreffect.attribute("out").toInt(); + + for (QDomNode n4 = kfreffect.firstChild(); !n4.isNull(); n4 = n4.nextSibling()) { + // parse effect parameters + QDomElement subeffectparam = n4.toElement(); + if (subeffectparam.attribute("name") == "kdenlive_ix" && subeffectparam.text() != effectindex) { + //We are not in the same effect, stop parsing + lastParsedEffect = n2.previousSibling(); + continueParsing = false; + break; + } else if (subeffectparam.attribute("name") == endtag) { + endvalue = subeffectparam.text().toDouble() * factor; + break; + } + } + if (continueParsing) keyframes.append(QString::number(effectout) + ":" + QString::number(endvalue) + ";"); + ix++; + } - // adjust effect parameters - for (QDomNode n3 = effect.firstChild(); !n3.isNull(); n3 = n3.nextSibling()) { - // parse effect parameters - QDomElement effectparam = n3.toElement(); - QString paramname = effectparam.attribute("name"); - QString paramvalue = effectparam.text(); - - // try to find this parameter in the effect xml - QDomElement e; - for (int k = 0; k < clipeffectparams.count(); k++) { - e = clipeffectparams.item(k).toElement(); - if (!e.isNull() && e.tagName() == "parameter" && e.attribute("name") == paramname) { - e.setAttribute("value", paramvalue); - break; + params = currenteffect.elementsByTagName("parameter"); + for (int i = 0; i < params.count(); i++) { + QDomElement e = params.item(i).toElement(); + if (e.attribute("type") == "keyframe") e.setAttribute("keyframes", keyframes); + } + if (!continueParsing) { + n2 = lastParsedEffect; } } + + // adjust effect parameters + for (QDomNode n3 = effect.firstChild(); !n3.isNull(); n3 = n3.nextSibling()) { + // parse effect parameters + QDomElement effectparam = n3.toElement(); + QString paramname = effectparam.attribute("name"); + QString paramvalue = effectparam.text(); + + // try to find this parameter in the effect xml + QDomElement e; + for (int k = 0; k < clipeffectparams.count(); k++) { + e = clipeffectparams.item(k).toElement(); + if (!e.isNull() && e.tagName() == "parameter" && e.attribute("name") == paramname) { + e.setAttribute("value", paramvalue); + break; + } + } + } + item->addEffect(currenteffect, false); + item->effectsCounter(); } - item->addEffect(clipeffect, false); } } - } else kWarning() << "CANNOT INSERT CLIP " << id; //m_clipList.append(clip); } @@ -371,4 +520,6 @@ const QString & TrackView::editMode() const { return m_editMode; } + + #include "trackview.moc"