X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftrackview.cpp;h=b2303ecb6d429f756bbbbba555afd30777fcad9f;hb=3d9ff40b713934e307b6ac7808bd8d56d0bd66f7;hp=41ea52094802dfffa506b171a54323781aeadc99;hpb=4ef6fc168cffdc049504f22c4f9ca48db14d299d;p=kdenlive diff --git a/src/trackview.cpp b/src/trackview.cpp index 41ea5209..b2303ecb 100644 --- a/src/trackview.cpp +++ b/src/trackview.cpp @@ -30,7 +30,7 @@ #include "customtrackview.h" #include "initeffects.h" #include "profilesdialog.h" -#include "configtrackscommand.h" +#include "commands/configtrackscommand.h" #include #include @@ -39,14 +39,14 @@ #include #include -TrackView::TrackView(KdenliveDoc *doc, bool *ok, QWidget *parent) : +TrackView::TrackView(KdenliveDoc *doc, const QList &actions, bool *ok, QWidget *parent) : QWidget(parent), m_scale(1.0), m_projectTracks(0), m_doc(doc), m_verticalZoom(1) { - + m_trackActions << actions; setupUi(this); // ruler_frame->setMaximumHeight(); // size_frame->setMaximumHeight(); @@ -56,18 +56,21 @@ TrackView::TrackView(KdenliveDoc *doc, bool *ok, QWidget *parent) : 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, bool *ok, QWidget *parent) : 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); @@ -124,6 +129,7 @@ TrackView::~TrackView() { delete m_ruler; delete m_trackview; + delete m_scene; } //virtual @@ -185,24 +191,18 @@ void TrackView::setDuration(int dur) m_ruler->setDuration(dur); } -void TrackView::parseDocument(QDomDocument doc) +void TrackView::parseDocument(const QDomDocument &doc) { //int cursorPos = 0; m_documentErrors.clear(); m_replacementProducerIds.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 mlt = doc.firstChildElement("mlt"); 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; @@ -216,21 +216,6 @@ void TrackView::parseDocument(QDomDocument doc) 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: "<mltProfile(), factor); - } else fact = factor.toDouble(); - double val = paramValue.toDouble() * fact; - paramValue = QString::number(val); + } else { + fact = factor.toDouble(); + } + paramValue = QLocale().toString(offset + paramValue.toDouble() * fact); } } e.setAttribute("value", paramValue); @@ -429,10 +414,14 @@ 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++) { @@ -488,13 +477,13 @@ 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) { m_ruler->setPixelPerMark(horizontal); - m_scale = (double) FRAME_SIZE / m_ruler->comboScale[horizontal]; + m_scale = (double) m_trackview->getFrameWidth() / m_ruler->comboScale[horizontal]; if (vertical == -1) { // user called zoom @@ -512,7 +501,7 @@ void TrackView::slotChangeZoom(int horizontal, int vertical) int TrackView::fitZoom() const { - int zoom = (int)((duration() + 20 / m_scale) * FRAME_SIZE / m_trackview->width()); + int zoom = (int)((duration() + 20 / m_scale) * m_trackview->getFrameWidth() / m_trackview->width()); int i; for (i = 0; i < 13; i++) if (m_ruler->comboScale[i] > zoom) break; @@ -556,23 +545,24 @@ void TrackView::slotRebuildTrackHeaders() int height = KdenliveSettings::trackheight() * m_scene->scale().y() - 1; HeaderTrack *header = NULL; QFrame *frame = NULL; + + updatePalette(); + for (int i = 0; i < max; i++) { frame = new QFrame(headers_container); frame->setFrameStyle(QFrame::HLine); frame->setFixedHeight(1); headers_container->layout()->addWidget(frame); TrackInfo info = list.at(max - i - 1); - header = new HeaderTrack(i, info, height, headers_container); + header = new HeaderTrack(i, info, height, m_trackActions, headers_container); 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(deleteTrack(int)), this, SIGNAL(deleteTrack(int))); - connect(header, SIGNAL(insertTrack(int)), this, SIGNAL(insertTrack(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); } @@ -583,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; @@ -597,6 +601,7 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked, QDomNod // parse track int position = 0; QMap producerReplacementIds; + int frame_width = m_trackview->getFrameWidth(); QDomNodeList children = xml.childNodes(); for (int nodeindex = 0; nodeindex < children.count(); nodeindex++) { QDomNode n = children.item(nodeindex); @@ -623,8 +628,9 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked, QDomNod double speed = 1.0; int strobe = 1; if (idString.startsWith("slowmotion")) { + QLocale locale; id = idString.section(':', 1, 1); - speed = idString.section(':', 2, 2).toDouble(); + speed = locale.toDouble(idString.section(':', 2, 2)); strobe = idString.section(':', 3, 3).toInt(); if (strobe == 0) strobe = 1; } @@ -644,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); @@ -674,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); @@ -697,7 +703,10 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked, QDomNod QString service = EffectsList::property(prod, "mlt_service"); QString type = EffectsList::property(prod, "mlt_type"); QString resource = EffectsList::property(prod, "resource"); - if (!resource.startsWith('/') && service != "colour") resource.prepend(docRoot); + if (!resource.startsWith('/') && service != "colour") { + resource.prepend(docRoot); + kDebug()<<"******************\nADJUSTED 1\n*************************"; + } QString length = EffectsList::property(prod, "length"); producerXml.setAttribute("mlt_service", service); producerXml.setAttribute("mlt_type", type); @@ -734,7 +743,7 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked, QDomNod 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(), speed, strobe, false); + ClipItem *item = new ClipItem(clip, clipinfo, m_doc->fps(), speed, strobe, frame_width, false); if (idString.endsWith("_video")) item->setVideoOnly(true); else if (idString.endsWith("_audio")) item->setAudioOnly(true); m_scene->addItem(item); @@ -762,6 +771,7 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked, QDomNod void TrackView::slotAddProjectEffects(QDomNodeList effects, QDomElement parentNode, ClipItem *clip, int trackIndex) { int effectNb = 0; + QLocale locale; for (int ix = 0; ix < effects.count(); ix++) { bool disableeffect = false; QDomElement effect = effects.at(ix).toElement(); @@ -770,8 +780,8 @@ void TrackView::slotAddProjectEffects(QDomNodeList effects, QDomElement parentNo // add effect to clip QString effecttag; QString effectid; + QString effectinfo; QString effectindex = QString::number(effectNb); - QString ladspaEffectFile; // Get effect tag & index for (QDomNode n3 = effect.firstChild(); !n3.isNull(); n3 = n3.nextSibling()) { // parse effect parameters @@ -780,32 +790,19 @@ 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; } else if (effectparam.attribute("name") == "kdenlive_ix") { // Fix effects index effectparam.firstChild().setNodeValue(effectindex); - } else if (effectparam.attribute("name") == "src") { - ladspaEffectFile = effectparam.text(); - if (!QFile::exists(ladspaEffectFile)) { - // If the ladspa effect file is missing, recreate it - kDebug() << "// MISSING LADSPA FILE: " << ladspaEffectFile; - ladspaEffectFile = m_doc->getLadspaFile(); - effectparam.firstChild().setNodeValue(ladspaEffectFile); - kDebug() << "// ... REPLACED WITH: " << ladspaEffectFile; - } } } //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)); @@ -814,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)) { @@ -822,6 +820,7 @@ void TrackView::slotAddProjectEffects(QDomNodeList effects, QDomElement parentNo QString factor; QString starttag; QString endtag; + double offset = 0; QDomNodeList params = currenteffect.elementsByTagName("parameter"); for (int i = 0; i < params.count(); i++) { QDomElement e = params.item(i).toElement(); @@ -829,6 +828,7 @@ void TrackView::slotAddProjectEffects(QDomNodeList effects, QDomElement parentNo starttag = e.attribute("starttag", "start"); endtag = e.attribute("endtag", "end"); factor = e.attribute("factor", "1"); + offset = e.attribute("offset", "0").toDouble(); break; } } @@ -838,23 +838,24 @@ void TrackView::slotAddProjectEffects(QDomNodeList effects, QDomElement parentNo double startvalue = 0; double endvalue = 0; double fact; - if (factor.isEmpty()) fact = 1; - else if (factor.contains('%')) { + if (factor.contains('%')) { fact = ProfilesDialog::getStringEval(m_doc->mltProfile(), factor); - } else fact = factor.toDouble(); + } else { + fact = factor.toDouble(); + } 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() * fact; + startvalue = offset + effectparam.text().toDouble() * fact; if (effectparam.attribute("name") == endtag) - endvalue = effectparam.text().toDouble() * fact; + endvalue = offset + effectparam.text().toDouble() * fact; } // add first keyframe if (effectout <= effectin) { // there is only one keyframe - keyframes.append(QString::number(effectin) + ':' + QString::number(startvalue) + ';'); - } else keyframes.append(QString::number(effectin) + ':' + QString::number(startvalue) + ';' + QString::number(effectout) + ':' + QString::number(endvalue) + ';'); + keyframes.append(QString::number(effectin) + ':' + locale.toString(startvalue) + ';'); + } else keyframes.append(QString::number(effectin) + ':' + locale.toString(startvalue) + ';' + QString::number(effectout) + ':' + QString::number(endvalue) + ';'); QDomNode lastParsedEffect; ix++; QDomNode n2 = effects.at(ix); @@ -874,12 +875,12 @@ void TrackView::slotAddProjectEffects(QDomNodeList effects, QDomElement parentNo continueParsing = false; break; } else if (subeffectparam.attribute("name") == endtag) { - endvalue = subeffectparam.text().toDouble() * fact; + endvalue = offset + subeffectparam.text().toDouble() * fact; break; } } if (continueParsing) { - keyframes.append(QString::number(effectout) + ':' + QString::number(endvalue) + ';'); + keyframes.append(QString::number(effectout) + ':' + locale.toString(endvalue) + ';'); ix++; } } @@ -895,63 +896,58 @@ 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(); - } - 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 = kfrs.at(l).section('=', 1, 1).toDouble(); - kfrs[l] = fr + ":" + QString::number((int)(val * fact)); - } - e.setAttribute("keyframes", kfrs.join(";")); - } else if (type == "double" || type == "constant") { - bool ok; - e.setAttribute("value", paramvalue.toDouble(&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); + } - // Old LADSPA filter, deprecated - /*if (effecttag == "ladspa") { - //QString ladspaEffectFile = EffectsList::parameter(effect, "src", "property"); - - if (!QFile::exists(ladspaEffectFile)) { - // If the ladspa effect file is missing, recreate it - initEffects::ladspaEffectFile(ladspaEffectFile, currenteffect.attribute("ladspaid").toInt(), m_trackview->getLadspaParams(currenteffect)); - } - currenteffect.setAttribute("src", ladspaEffectFile); - }*/ + + 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) @@ -963,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; @@ -1011,7 +1059,10 @@ DocClipBase *TrackView::getMissingProducer(const QString id) const if (slowmotionClip) resource = resource.section('?', 0, 0); // prepend MLT XML document root if no path in clip resource and not a color clip - if (!resource.startsWith('/') && service != "colour") resource.prepend(docRoot); + if (!resource.startsWith('/') && service != "colour") { + resource.prepend(docRoot); + kDebug()<<"******************\nADJUSTED 2\n*************************"; + } DocClipBase *missingClip = NULL; if (!resource.isEmpty()) { QList list = m_doc->clipManager()->getClipByResource(resource); @@ -1128,6 +1179,24 @@ void TrackView::slotSaveTimelinePreview(const QString path) img.save(path); } +void TrackView::updateProfile() +{ + m_ruler->updateFrameSize(); + m_trackview->updateSceneFrameWidth(); + slotChangeZoom(m_doc->zoom().x(), m_doc->zoom().y()); + slotSetZone(m_doc->zone(), false); +} + +void TrackView::checkTrackHeight() +{ + if (m_trackview->checkTrackHeight()) { + m_doc->clipManager()->clearCache(); + m_ruler->updateFrameSize(); + m_trackview->updateSceneFrameWidth(); + slotChangeZoom(m_doc->zoom().x(), m_doc->zoom().y()); + slotSetZone(m_doc->zone(), false); + } +} #include "trackview.moc"