X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftrackview.cpp;h=e88bfb794c2b810d59a2cea7e8c47763b8a31a16;hb=1ea8ebcfd35fd09ff13a3e065c6d635466ce33a1;hp=62352d27a12f5cf0cdd5b21b05eb0a687c38439b;hpb=ef3cf43058edf431c4ef7b235f8fef294d2bb5ee;p=kdenlive diff --git a/src/trackview.cpp b/src/trackview.cpp index 62352d27..e88bfb79 100644 --- a/src/trackview.cpp +++ b/src/trackview.cpp @@ -56,18 +56,21 @@ TrackView::TrackView(KdenliveDoc *doc, QList actions, bool *ok, QWidg m_trackview->setAlignment(Qt::AlignLeft | Qt::AlignTop); m_ruler = new CustomRuler(doc->timecode(), m_trackview); - connect(m_ruler, SIGNAL(zoneMoved(int, int)), this, SIGNAL(zoneMoved(int, int))); + connect(m_ruler, SIGNAL(zoneMoved(int,int)), this, SIGNAL(zoneMoved(int,int))); connect(m_ruler, SIGNAL(adjustZoom(int)), this, SIGNAL(setZoom(int))); + connect(m_ruler, SIGNAL(mousePosition(int)), this, SIGNAL(mousePosition(int))); QHBoxLayout *layout = new QHBoxLayout; layout->setContentsMargins(m_trackview->frameWidth(), 0, 0, 0); layout->setSpacing(0); ruler_frame->setLayout(layout); + ruler_frame->setMaximumHeight(m_ruler->height()); layout->addWidget(m_ruler); QHBoxLayout *sizeLayout = new QHBoxLayout; sizeLayout->setContentsMargins(0, 0, 0, 0); sizeLayout->setSpacing(0); size_frame->setLayout(sizeLayout); + size_frame->setMaximumHeight(m_ruler->height()); QToolButton *butSmall = new QToolButton(this); butSmall->setIcon(KIcon("kdenlive-zoom-small")); @@ -103,18 +106,20 @@ TrackView::TrackView(KdenliveDoc *doc, QList actions, bool *ok, QWidg connect(m_trackview, SIGNAL(trackHeightChanged()), this, SLOT(slotRebuildTrackHeaders())); connect(m_trackview, SIGNAL(tracksChanged()), this, SLOT(slotReloadTracks())); connect(m_trackview, SIGNAL(updateTrackHeaders()), this, SLOT(slotRepaintTracks())); - connect(m_trackview, SIGNAL(showTrackEffects(int, TrackInfo)), this, SIGNAL(showTrackEffects(int, TrackInfo))); + connect(m_trackview, SIGNAL(showTrackEffects(int,TrackInfo)), this, SIGNAL(showTrackEffects(int,TrackInfo))); connect(m_trackview, SIGNAL(updateTrackEffectState(int)), this, SLOT(slotUpdateTrackEffectState(int))); parseDocument(m_doc->toXml()); if (m_doc->setSceneList() == -1) *ok = false; else *ok = true; - connect(m_trackview, SIGNAL(cursorMoved(int, int)), m_ruler, SLOT(slotCursorMoved(int, int))); + connect(m_trackview, SIGNAL(cursorMoved(int,int)), m_ruler, SLOT(slotCursorMoved(int,int))); + connect(m_trackview, SIGNAL(updateRuler()), m_ruler, SLOT(updateRuler())); + connect(m_trackview->horizontalScrollBar(), SIGNAL(valueChanged(int)), m_ruler, SLOT(slotMoveRuler(int))); - connect(m_trackview->horizontalScrollBar(), SIGNAL(rangeChanged(int, int)), this, SLOT(slotUpdateVerticalScroll(int, int))); + connect(m_trackview->horizontalScrollBar(), SIGNAL(rangeChanged(int,int)), this, SLOT(slotUpdateVerticalScroll(int,int))); connect(m_trackview, SIGNAL(mousePosition(int)), this, SIGNAL(mousePosition(int))); - connect(m_trackview, SIGNAL(doTrackLock(int, bool)), this, SLOT(slotChangeTrackLock(int, bool))); + connect(m_trackview, SIGNAL(doTrackLock(int,bool)), this, SLOT(slotChangeTrackLock(int,bool))); slotChangeZoom(m_doc->zoom().x(), m_doc->zoom().y()); slotSetZone(m_doc->zone(), false); @@ -197,7 +202,7 @@ void TrackView::parseDocument(QDomDocument doc) QDomElement tractor = mlt.firstChildElement("tractor"); QDomNodeList tracks = tractor.elementsByTagName("track"); QDomNodeList playlists = doc.elementsByTagName("playlist"); - int duration = 300; + int duration = 1; m_projectTracks = tracks.count(); int trackduration = 0; QDomElement e; @@ -411,6 +416,12 @@ void TrackView::parseDocument(QDomDocument doc) } QDomElement infoXml = mlt.firstChildElement("kdenlivedoc"); + QDomElement propsXml = infoXml.firstChildElement("documentproperties"); + + int currentPos = propsXml.attribute("position").toInt(); + if (currentPos > 0) m_trackview->initCursorPos(currentPos); + + // Add guides QDomNodeList guides = infoXml.elementsByTagName("guide"); for (int i = 0; i < guides.count(); i++) { @@ -466,7 +477,7 @@ void TrackView::setCursorPos(int pos) void TrackView::moveCursorPos(int pos) { - m_trackview->setCursorPos(pos, false); + m_trackview->setCursorPos(pos); } void TrackView::slotChangeZoom(int horizontal, int vertical) @@ -535,14 +546,7 @@ void TrackView::slotRebuildTrackHeaders() HeaderTrack *header = NULL; QFrame *frame = NULL; - QPalette p = palette(); - KColorScheme scheme(p.currentColorGroup(), KColorScheme::View, KSharedConfig::openConfig(KdenliveSettings::colortheme())); - QColor norm = scheme.shade(scheme.background(KColorScheme::ActiveBackground).color(), KColorScheme::MidShade); - p.setColor(QPalette::Button, norm); - - QColor col = scheme.background().color(); - QColor col2 = scheme.foreground().color(); - headers_container->setStyleSheet(QString("QLineEdit { background-color: transparent;color: rgb(%4, %5, %6);} QLineEdit:hover{ background-color: rgb(%1, %2, %3);} QLineEdit:focus { background-color: rgb(%1, %2, %3);}").arg(col.red()).arg(col.green()).arg(col.blue()).arg(col2.red()).arg(col2.green()).arg(col2.blue())); + updatePalette(); for (int i = 0; i < max; i++) { frame = new QFrame(headers_container); @@ -551,15 +555,14 @@ void TrackView::slotRebuildTrackHeaders() headers_container->layout()->addWidget(frame); TrackInfo info = list.at(max - i - 1); header = new HeaderTrack(i, info, height, m_trackActions, headers_container); - header->setPalette(p); header->setSelectedIndex(m_trackview->selectedTrack()); 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(selectTrack(int)), m_trackview, SLOT(slotSelectTrack(int))); - connect(header, SIGNAL(renameTrack(int, QString)), this, SLOT(slotRenameTrack(int, QString))); + connect(header, SIGNAL(renameTrack(int,QString)), this, SLOT(slotRenameTrack(int,QString))); connect(header, SIGNAL(configTrack(int)), this, SIGNAL(configTrack(int))); - connect(header, SIGNAL(addTrackInfo(const QDomElement, int)), m_trackview, SLOT(slotAddTrackEffect(const QDomElement, int))); + connect(header, SIGNAL(addTrackEffect(QDomElement,int)), m_trackview, SLOT(slotAddTrackEffect(QDomElement,int))); connect(header, SIGNAL(showTrackEffects(int)), this, SLOT(slotShowTrackEffects(int))); headers_container->layout()->addWidget(header); } @@ -570,6 +573,20 @@ void TrackView::slotRebuildTrackHeaders() } +void TrackView::updatePalette() +{ + QPalette p = palette(); + KColorScheme scheme(p.currentColorGroup(), KColorScheme::View, KSharedConfig::openConfig(KdenliveSettings::colortheme())); + QColor norm = scheme.shade(scheme.background(KColorScheme::ActiveBackground).color(), KColorScheme::MidShade); + p.setColor(QPalette::Button, norm); + QColor col = scheme.background().color(); + QColor col2 = scheme.foreground().color(); + headers_container->setStyleSheet(QString("QLineEdit { background-color: transparent;color: %1;} QLineEdit:hover{ background-color: %2;} QLineEdit:focus { background-color: %2;}").arg(col2.name()).arg(col.name())); + m_trackview->updatePalette(); + m_ruler->updatePalette(); + +} + void TrackView::adjustTrackHeaders() { int height = KdenliveSettings::trackheight() * m_scene->scale().y() - 1; @@ -633,7 +650,7 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked, QDomNod QString prodId = clip->getId(); if (clip->clipType() == PLAYLIST || clip->clipType() == AV || clip->clipType() == AUDIO) { // We need producer for the track - prodId.append("_" + QString::number(ix)); + prodId.append('_' + QString::number(ix)); } elem.setAttribute("producer", prodId); producerReplacementIds.insert(idString, prodId); @@ -663,7 +680,7 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked, QDomNod for (int i = 0; i < producers.count(); i++) { QDomElement prod = producers.at(i).toElement(); QString mltProdId = prod.attribute("id"); - if (mltProdId == prodId || mltProdId.startsWith(prodId + "_")) { + if (mltProdId == prodId || mltProdId.startsWith(prodId + '_')) { // Found parent producer, clone it QDomElement clone = prod.cloneNode().toElement(); clone.setAttribute("id", prodId); @@ -763,6 +780,7 @@ void TrackView::slotAddProjectEffects(QDomNodeList effects, QDomElement parentNo // add effect to clip QString effecttag; QString effectid; + QString effectinfo; QString effectindex = QString::number(effectNb); // Get effect tag & index for (QDomNode n3 = effect.firstChild(); !n3.isNull(); n3 = n3.nextSibling()) { @@ -772,6 +790,8 @@ void TrackView::slotAddProjectEffects(QDomNodeList effects, QDomElement parentNo effecttag = effectparam.text(); } else if (effectparam.attribute("name") == "kdenlive_id") { effectid = effectparam.text(); + } else if (effectparam.attribute("name") == "kdenlive_info") { + effectinfo = effectparam.text(); } else if (effectparam.attribute("name") == "disable" && effectparam.text().toInt() == 1) { // Fix effects index disableeffect = true; @@ -782,13 +802,7 @@ void TrackView::slotAddProjectEffects(QDomNodeList effects, QDomElement parentNo } //kDebug() << "+ + CLIP EFF FND: " << effecttag << ", " << effectid << ", " << effectindex; // get effect standard tags - 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); - } + QDomElement clipeffect = 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)); @@ -797,6 +811,7 @@ void TrackView::slotAddProjectEffects(QDomNodeList effects, QDomElement parentNo } else { QDomElement currenteffect = clipeffect.cloneNode().toElement(); currenteffect.setAttribute("kdenlive_ix", effectindex); + currenteffect.setAttribute("kdenlive_info", effectinfo); QDomNodeList clipeffectparams = currenteffect.childNodes(); if (MainWindow::videoEffects.hasKeyFrames(currenteffect)) { @@ -881,56 +896,59 @@ void TrackView::slotAddProjectEffects(QDomNodeList effects, QDomElement parentNo } else { // Check if effect has in/out points if (effect.hasAttribute("in")) { - EffectsList::setParameter(currenteffect, "in", effect.attribute("in")); + EffectsList::setParameter(currenteffect, "in", effect.attribute("in")); + currenteffect.setAttribute("in", effect.attribute("in")); + currenteffect.setAttribute("_sync_in_out", "1"); } if (effect.hasAttribute("out")) { - EffectsList::setParameter(currenteffect, "out", effect.attribute("out")); + EffectsList::setParameter(currenteffect, "out", effect.attribute("out")); + currenteffect.setAttribute("out", effect.attribute("out")); } } - + + // Special case, region filter embeds other effects + bool regionFilter = effecttag == "region"; + QMap regionEffects; + // 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) { - QString type = e.attribute("type"); - QString factor = e.attribute("factor", "1"); - double fact; - if (factor.contains('%')) { - fact = ProfilesDialog::getStringEval(m_doc->mltProfile(), factor); - } else { - fact = factor.toDouble(); - } - double offset = e.attribute("offset", "0").toDouble(); - if (type == "simplekeyframe") { - QStringList kfrs = paramvalue.split(";"); - for (int l = 0; l < kfrs.count(); l++) { - QString fr = kfrs.at(l).section('=', 0, 0); - double val = locale.toDouble(kfrs.at(l).section('=', 1, 1)); - //kfrs[l] = fr + ":" + locale.toString((int)(val * fact)); - kfrs[l] = fr + ":" + QString::number((int) (offset + val * fact)); - } - e.setAttribute("keyframes", kfrs.join(";")); - } else if (type == "double" || type == "constant") { - bool ok; - e.setAttribute("value", offset + locale.toDouble(paramvalue, &ok) * fact); - if (!ok) - e.setAttribute("value", paramvalue); - } else { - e.setAttribute("value", paramvalue); - } - break; - } - } + + if (regionFilter && paramname.startsWith("filter")) { + regionEffects.insert(paramname, paramvalue); + continue; + } + + // try to find this parameter in the effect xml and set its value + adjustparameterValue(clipeffectparams, paramname, paramvalue); + } + if (regionFilter && !regionEffects.isEmpty()) { + // insert region sub-effects + int i = 0; + while (regionEffects.contains(QString("filter%1").arg(i))) { + QString filterid = regionEffects.value(QString("filter%1.kdenlive_id").arg(i)); + QString filtertag = regionEffects.value(QString("filter%1.tag").arg(i)); + QDomElement subclipeffect = getEffectByTag(filtertag, filterid).cloneNode().toElement(); + QDomNodeList subclipeffectparams = subclipeffect.childNodes(); + subclipeffect.setAttribute("region_ix", i); + QMap::const_iterator j = regionEffects.constBegin(); + while (j != regionEffects.constEnd()) { + if (j.key().startsWith(QString("filter%1.").arg(i))) { + QString pname = j.key().section('.', 1, -1); + adjustparameterValue(subclipeffectparams, pname, j.value()); + } + ++j; + } + currenteffect.appendChild(currenteffect.ownerDocument().importNode(subclipeffect, true)); + i++; + } + } + if (disableeffect) currenteffect.setAttribute("disable", "1"); if (clip) clip->addEffect(currenteffect, false); @@ -941,6 +959,58 @@ void TrackView::slotAddProjectEffects(QDomNodeList effects, QDomElement parentNo } +void TrackView::adjustparameterValue(QDomNodeList clipeffectparams, const QString ¶mname, const QString ¶mvalue) +{ + QDomElement e; + QLocale locale; + for (int k = 0; k < clipeffectparams.count(); k++) { + e = clipeffectparams.item(k).toElement(); + if (!e.isNull() && e.tagName() == "parameter" && e.attribute("name") == paramname) { + QString type = e.attribute("type"); + QString factor = e.attribute("factor", "1"); + double fact; + if (factor.contains('%')) { + fact = ProfilesDialog::getStringEval(m_doc->mltProfile(), factor); + } else { + fact = factor.toDouble(); + } + double offset = e.attribute("offset", "0").toDouble(); + if (type == "simplekeyframe") { + QStringList kfrs = paramvalue.split(";"); + for (int l = 0; l < kfrs.count(); l++) { + QString fr = kfrs.at(l).section('=', 0, 0); + double val = locale.toDouble(kfrs.at(l).section('=', 1, 1)); + //kfrs[l] = fr + ":" + locale.toString((int)(val * fact)); + kfrs[l] = fr + ':' + QString::number((int) (offset + val * fact)); + } + e.setAttribute("keyframes", kfrs.join(";")); + } else if (type == "double" || type == "constant") { + bool ok; + e.setAttribute("value", offset + locale.toDouble(paramvalue, &ok) * fact); + if (!ok) + e.setAttribute("value", paramvalue); + } else { + e.setAttribute("value", paramvalue); + } + break; + } + } +} + + +QDomElement TrackView::getEffectByTag(const QString &effecttag, const QString &effectid) +{ + 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); + } + return clipeffect; +} + + DocClipBase *TrackView::getMissingProducer(const QString id) const { QDomElement missingXml;