X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftrackview.cpp;h=cffa2a52be08169945b063d557626a4f7999f1bc;hb=1b28a1f6120bc1c38750aab05c059bc8210b6418;hp=16e0da314683bb46a31b69d0b36313a530b22381;hpb=1bb5954abb1179a8cd75a3dbffec0911f297357e;p=kdenlive diff --git a/src/trackview.cpp b/src/trackview.cpp index 16e0da31..cffa2a52 100644 --- a/src/trackview.cpp +++ b/src/trackview.cpp @@ -19,7 +19,6 @@ #include "trackview.h" -#include "definitions.h" #include "headertrack.h" #include "clipitem.h" #include "transition.h" @@ -31,6 +30,7 @@ #include "customtrackview.h" #include "initeffects.h" #include "profilesdialog.h" +#include "commands/configtrackscommand.h" #include #include @@ -39,36 +39,38 @@ #include #include -TrackView::TrackView(KdenliveDoc *doc, bool *ok, QWidget *parent) : - QWidget(parent), - m_scale(1.0), - m_projectTracks(0), - m_doc(doc), - m_verticalZoom(1) +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(); + // ruler_frame->setMaximumHeight(); + // size_frame->setMaximumHeight(); 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))); + 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")); @@ -104,24 +106,30 @@ 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(updateTrackEffectState(int)), this, SLOT(slotUpdateTrackEffectState(int))); + parseDocument(m_doc->toXml()); - int error = m_doc->setSceneList(); - if (error == -1) *ok = false; + 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, 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()); + slotSetZone(m_doc->zone(), false); } TrackView::~TrackView() { delete m_ruler; delete m_trackview; + delete m_scene; } //virtual @@ -146,6 +154,21 @@ int TrackView::tracksNumber() const return m_projectTracks - 1; } +bool TrackView::checkProjectAudio() const +{ + bool hasAudio = false; + const QList list = m_doc->tracksList(); + int max = list.count(); + for (int i = 0; i < max; ++i) { + TrackInfo info = list.at(max - i - 1); + if (!info.isMute && m_trackview->hasAudio(i)) { + hasAudio = true; + break; + } + } + return hasAudio; +} + int TrackView::inPoint() const { return m_ruler->inPoint(); @@ -156,9 +179,10 @@ int TrackView::outPoint() const return m_ruler->outPoint(); } -void TrackView::slotSetZone(QPoint p) +void TrackView::slotSetZone(const QPoint &p, bool updateDocumentProperties) { m_ruler->setZone(p); + if (updateDocumentProperties) m_doc->setZone(p.x(), p.y()); } void TrackView::setDuration(int dur) @@ -167,22 +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(); - - //kDebug() << "//// DOCUMENT: " << doc.toString(); - /*QDomNode props = doc.elementsByTagName("properties").item(0); - if (!props.isNull()) { - cursorPos = props.toElement().attribute("timeline_position").toInt(); - }*/ + m_replacementProducerIds.clear(); // parse project tracks - QDomElement tractor = doc.elementsByTagName("tractor").item(0).toElement(); - QDomNodeList tracks = doc.elementsByTagName("track"); + 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; @@ -191,40 +211,26 @@ void TrackView::parseDocument(QDomDocument doc) int pos = m_projectTracks - 1; m_invalidProducers.clear(); QDomNodeList producers = doc.elementsByTagName("producer"); - for (int i = 0; i < producers.count(); i++) { + 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) { + if (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--; + --i; } } - for (int i = 0; i < m_projectTracks; i++) { + int trackIndex = 0; + for (int i = 0; i < m_projectTracks; ++i) { e = tracks.item(i).toElement(); QString playlist_name = e.attribute("producer"); if (playlist_name != "black_track" && playlist_name != "playlistmain") { @@ -232,7 +238,12 @@ void TrackView::parseDocument(QDomDocument doc) p = QDomElement(); for (int j = 0; j < m_projectTracks; j++) { p = playlists.item(j).toElement(); - if (p.attribute("id") == playlist_name) break; + if (p.attribute("id") == playlist_name) { + // playlist found, check track effects + QDomNodeList trackEffects = p.childNodes(); + slotAddProjectEffects(trackEffects, p, NULL, trackIndex++); + break; + } } if (p.attribute("id") != playlist_name) { // then it didn't work. kDebug() << "NO PLAYLIST FOUND FOR TRACK " + pos; @@ -246,7 +257,7 @@ void TrackView::parseDocument(QDomDocument doc) m_doc->switchTrackAudio(i - 1, true); } - trackduration = slotAddProjectTrack(pos, p, m_doc->isTrackLocked(i - 1)); + trackduration = slotAddProjectTrack(pos, p, m_doc->isTrackLocked(i - 1), producers); pos--; //kDebug() << " PRO DUR: " << trackduration << ", TRACK DUR: " << duration; if (trackduration > duration) duration = trackduration; @@ -261,10 +272,10 @@ void TrackView::parseDocument(QDomDocument doc) } // parse transitions - QDomNodeList transitions = doc.elementsByTagName("transition"); + QDomNodeList transitions = tractor.elementsByTagName("transition"); //kDebug() << "//////////// TIMELINE FOUND: " << projectTransitions << " transitions"; - for (int i = 0; i < transitions.count(); i++) { + for (int i = 0; i < transitions.count(); ++i) { e = transitions.item(i).toElement(); QDomNodeList transitionparams = e.childNodes(); bool transitionAdd = true; @@ -311,7 +322,7 @@ void TrackView::parseDocument(QDomDocument doc) // invalid transition, remove it m_documentErrors.append(i18n("Removed invalid transition: %1", e.attribute("id")) + '\n'); tractor.removeChild(transitions.item(i)); - i--; + --i; continue; } if (transitionAdd || mlt_service != "mix") { @@ -321,15 +332,13 @@ void TrackView::parseDocument(QDomDocument doc) // When adding composite transition, check if it is a wipe transition 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); - start = start.section(':', 0, 1); - start.replace(QChar(':'), QChar(','), Qt::CaseInsensitive); - QString end = mlt_geometry.section('=', 1, 1); - end = end.section(':', 0, 1); - end.replace(QChar(':'), QChar(','), Qt::CaseInsensitive); - start.append(',' + end); - QStringList numbers = start.split(',', QString::SkipEmptyParts); + mlt_geometry.replace(QChar('x'), QChar(':'), Qt::CaseInsensitive); + mlt_geometry.replace(QChar(','), QChar(':'), Qt::CaseInsensitive); + mlt_geometry.replace(QChar('/'), QChar(':'), Qt::CaseInsensitive); + + QString start = mlt_geometry.section('=', 0, 0).section(':', 0, -2) + ':'; + start.append(mlt_geometry.section('=', 1, 1).section(':', 0, -2)); + QStringList numbers = start.split(':', QString::SkipEmptyParts); bool isWipeTransition = true; int checkNumber; for (int i = 0; i < numbers.size(); ++i) { @@ -342,33 +351,36 @@ void TrackView::parseDocument(QDomDocument doc) if (isWipeTransition) transitionId = "slide"; } } + QDomElement base = MainWindow::transitions.getEffectByTag(mlt_service, transitionId).cloneNode().toElement(); - for (int k = 0; k < transitionparams.count(); k++) { + if (!base.isNull()) 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 fact; - if (factor.startsWith('%')) { - fact = ProfilesDialog::getStringEval(m_doc->mltProfile(), factor); - } else fact = factor.toDouble(); - double val = paramValue.toDouble() * fact; - paramValue = QString::number(val); + 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"); + double offset = e.attribute("offset", "0").toDouble(); + if (factor != "1" || offset != 0) { + double fact; + if (factor.contains('%')) { + fact = ProfilesDialog::getStringEval(m_doc->mltProfile(), factor); + } else { + fact = factor.toDouble(); } + paramValue = QLocale().toString(offset + paramValue.toDouble() * fact); } - e.setAttribute("value", paramValue); - break; } + e.setAttribute("value", paramValue); + break; } + } } } @@ -381,13 +393,13 @@ void TrackView::parseDocument(QDomDocument doc) transitionInfo.track = m_projectTracks - 1 - b_track; //kDebug() << "/////////////// +++++++++++ ADDING TRANSITION ON TRACK: " << b_track << ", TOTAL TRKA: " << m_projectTracks; - if (transitionInfo.startPos >= transitionInfo.endPos) { + if (transitionInfo.startPos >= transitionInfo.endPos || base.isNull()) { // invalid transition, remove it. - m_documentErrors.append(i18n("Removed invalid transition: %1", e.attribute("id")) + '\n'); + m_documentErrors.append(i18n("Removed invalid transition: (%1, %2, %3)", e.attribute("id"), mlt_service, transitionId) + '\n'); kDebug() << "///// REMOVED INVALID TRANSITION: " << e.attribute("id"); tractor.removeChild(transitions.item(i)); - i--; - } else { + --i; + } else if (m_trackview->canBePastedTo(transitionInfo, TransitionWidget)) { Transition *tr = new Transition(transitionInfo, a_track, m_doc->fps(), base, isAutomatic); if (forceTrack) tr->setForcedTrack(true, a_track); m_scene->addItem(tr); @@ -395,12 +407,24 @@ void TrackView::parseDocument(QDomDocument doc) tr->setItemLocked(true); } } + else { + m_documentErrors.append(i18n("Removed overlapping transition: (%1, %2, %3)", e.attribute("id"), mlt_service, transitionId) + '\n'); + tractor.removeChild(transitions.item(i)); + --i; + } } } + 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 = doc.elementsByTagName("guide"); - for (int i = 0; i < guides.count(); i++) { + QDomNodeList guides = infoXml.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()); @@ -408,19 +432,17 @@ void TrackView::parseDocument(QDomDocument doc) } // Rebuild groups - QDomNodeList groups = doc.elementsByTagName("group"); + QDomNodeList groups = infoXml.elementsByTagName("group"); m_trackview->loadGroups(groups); m_trackview->setDuration(duration); kDebug() << "/////////// TOTAL PROJECT DURATION: " << duration; // Remove Kdenlive extra info from xml doc before sending it to MLT - QDomElement mlt = doc.firstChildElement("mlt"); - QDomElement infoXml = mlt.firstChildElement("kdenlivedoc"); mlt.removeChild(infoXml); slotRebuildTrackHeaders(); if (!m_documentErrors.isNull()) KMessageBox::sorry(this, m_documentErrors); - if (infoXml.hasAttribute("upgraded")) { + if (infoXml.hasAttribute("upgraded") || infoXml.hasAttribute("modified")) { // Our document was upgraded, create a backup copy just in case QString baseFile = m_doc->url().path().section(".kdenlive", 0, 0); int ct = 0; @@ -429,8 +451,15 @@ void TrackView::parseDocument(QDomDocument doc) ct++; backupFile = baseFile + "_backup" + QString::number(ct) + ".kdenlive"; } - if (KIO::NetAccess::file_copy(m_doc->url(), KUrl(backupFile), this)) KMessageBox::information(this, i18n("Your project file was upgraded to the latest Kdenlive document version.\n To make sure you don't lose data, a backup copy called %1 was created.", backupFile)); - else KMessageBox::information(this, i18n("Your project file was upgraded to the latest Kdenlive document version, it was not possible to create a backup copy.", backupFile)); + QString message; + if (infoXml.hasAttribute("upgraded")) + message = i18n("Your project file was upgraded to the latest Kdenlive document version.\nTo make sure you don't lose data, a backup copy called %1 was created.", backupFile); + else + message = i18n("Your project file was modified by Kdenlive.\nTo make sure you don't lose data, a backup copy called %1 was created.", backupFile); + if (KIO::NetAccess::file_copy(m_doc->url(), KUrl(backupFile), this)) + KMessageBox::information(this, message); + else + KMessageBox::information(this, i18n("Your project file was upgraded to the latest Kdenlive document version, but it was not possible to create a backup copy.", backupFile)); } //m_trackview->setCursorPos(cursorPos); //m_scrollBox->setGeometry(0, 0, 300 * zoomFactor(), m_scrollArea->height()); @@ -448,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 @@ -462,17 +491,19 @@ void TrackView::slotChangeZoom(int horizontal, int vertical) m_trackview->setScale(m_scale, m_scene->scale().y()); } else { m_verticalZoom = vertical; - if (m_verticalZoom == 0) m_trackview->setScale(m_scale, 0.5); - else m_trackview->setScale(m_scale, m_verticalZoom); + if (m_verticalZoom == 0) + m_trackview->setScale(m_scale, 0.5); + else + m_trackview->setScale(m_scale, m_verticalZoom); adjustTrackHeaders(); } } 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++) + for (i = 0; i < 13; ++i) if (m_ruler->comboScale[i] > zoom) break; return i; } @@ -489,13 +520,9 @@ void TrackView::refresh() void TrackView::slotRepaintTracks() { - QLayoutItem *child; - for (int i = 0; i < headers_container->layout()->count(); i++) { - child = headers_container->layout()->itemAt(i); - if (child->widget() && child->widget()->height() > 5) { - HeaderTrack *head = static_cast (child->widget()); - if (head) head->setSelectedIndex(m_trackview->selectedTrack()); - } + QList widgets = findChildren(); + for (int i = 0; i < widgets.count(); ++i) { + if (widgets.at(i)) widgets.at(i)->setSelectedIndex(m_trackview->selectedTrack()); } } @@ -518,49 +545,63 @@ void TrackView::slotRebuildTrackHeaders() int height = KdenliveSettings::trackheight() * m_scene->scale().y() - 1; HeaderTrack *header = NULL; QFrame *frame = NULL; - for (int i = 0; i < max; i++) { + + updatePalette(); + + for (int i = 0; i < max; ++i) { frame = new QFrame(headers_container); + frame->setFrameStyle(QFrame::HLine); frame->setFixedHeight(1); - frame->setFrameStyle(QFrame::Plain); - frame->setFrameShape(QFrame::Box); - frame->setLineWidth(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(changeTrack(int)), this, SIGNAL(changeTrack(int))); - connect(header, SIGNAL(renameTrack(int)), this, SLOT(slotRenameTrack(int))); + connect(header, SIGNAL(renameTrack(int,QString)), this, SLOT(slotRenameTrack(int,QString))); + connect(header, SIGNAL(configTrack(int)), this, SIGNAL(configTrack(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); } frame = new QFrame(this); + frame->setFrameStyle(QFrame::HLine); frame->setFixedHeight(1); - frame->setFrameStyle(QFrame::Plain); - frame->setFrameShape(QFrame::Box); - frame->setLineWidth(1); headers_container->layout()->addWidget(frame); } +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; - QLayoutItem *child; - for (int i = 0; i < headers_container->layout()->count(); i++) { - child = headers_container->layout()->itemAt(i); - if (child->widget() && child->widget()->height() > 5)(static_cast (child->widget()))->adjustSize(height); + QList widgets = findChildren(); + for (int i = 0; i < widgets.count(); ++i) { + if (widgets.at(i)) widgets.at(i)->adjustSize(height); } } -int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked) +int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked, const QDomNodeList &producers) { // 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); @@ -578,43 +619,117 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked) continue; } QString idString = elem.attribute("producer"); + if (producerReplacementIds.contains(idString)) { + // replace id + elem.setAttribute("producer", producerReplacementIds.value(idString)); + idString = elem.attribute("producer"); + } QString id = idString; 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; - } else id = id.section('_', 0, 0); + } + id = id.section('_', 0, 0); DocClipBase *clip = m_doc->clipManager()->getClipById(id); if (clip == NULL) { // The clip in playlist was not listed in the kdenlive producers, // something went wrong, repair required. kWarning() << "CANNOT INSERT CLIP " << id; - - clip = getMissingProducer(id); - if (!clip) { + QString docRoot = m_doc->toXml().documentElement().attribute("root"); + if (!docRoot.endsWith('/')) docRoot.append('/'); + clip = getMissingProducer(idString); + if (clip) { + // We found the original producer in Kdenlive's producers + // Found correct producer + m_documentErrors.append(i18n("Replaced wrong clip producer %1 with %2", id, clip->getId()) + '\n'); + 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)); + } + elem.setAttribute("producer", prodId); + producerReplacementIds.insert(idString, prodId); + // now adjust the mlt producer + bool found = false; + for (int i = 0; i < producers.count(); ++i) { + QDomElement prod = producers.at(i).toElement(); + if (prod.attribute("id") == prodId) { + // ok, producer already exists + found = true; + break; + } + } + if (!found) { + for (int i = 0; i < producers.count(); ++i) { + QDomElement prod = producers.at(i).toElement(); + if (prod.attribute("id") == idString) { + prod.setAttribute("id", prodId); + m_replacementProducerIds.insert(idString, prodId); + found = true; + break; + } + } + } + if (!found) { + // We didn't find the producer for this track, find producer for another track and duplicate + 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 + '_')) { + // Found parent producer, clone it + QDomElement clone = prod.cloneNode().toElement(); + clone.setAttribute("id", prodId); + m_doc->toXml().documentElement().insertBefore(clone, xml); + break; + } + } + } + } + else { // We cannot find the producer, something is really wrong, add // placeholder color clip QDomDocument doc; QDomElement producerXml = doc.createElement("producer"); doc.appendChild(producerXml); - producerXml.setAttribute("colour", "0xff0000ff"); - producerXml.setAttribute("mlt_service", "colour"); - producerXml.setAttribute("length", "15000"); - producerXml.setAttribute("name", "INVALID"); - producerXml.setAttribute("type", COLOR); - producerXml.setAttribute("id", id); - clip = new DocClipBase(m_doc->clipManager(), doc.documentElement(), id); - xml.insertBefore(producerXml, QDomNode()); - m_doc->clipManager()->addClip(clip); - - m_documentErrors.append(i18n("Broken clip producer %1", id) + '\n'); - } else { - // Found correct producer - m_documentErrors.append(i18n("Replaced wrong clip producer %1 with %2", id, clip->getId()) + '\n'); - elem.setAttribute("producer", clip->getId()); + bool foundMltProd = false; + for (int i = 0; i < producers.count(); ++i) { + QDomElement prod = producers.at(i).toElement(); + if (prod.attribute("id") == id) { + 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); + kDebug()<<"******************\nADJUSTED 1\n*************************"; + } + QString length = EffectsList::property(prod, "length"); + producerXml.setAttribute("mlt_service", service); + producerXml.setAttribute("mlt_type", type); + producerXml.setAttribute("resource", resource); + producerXml.setAttribute("duration", length); + if (service == "colour") producerXml.setAttribute("type", Color); + else if (service == "qimage" || service == "pixbuf") producerXml.setAttribute("type", Image); + else if (service == "kdenlivetitle") producerXml.setAttribute("type", Text); + else producerXml.setAttribute("type", AV); + clip = new DocClipBase(m_doc->clipManager(), doc.documentElement(), id); + m_doc->clipManager()->addClip(clip); + m_documentErrors.append(i18n("Broken clip producer %1, recreated base clip: %2", id, resource) + '\n'); + foundMltProd = true; + break; + } + } + if (!foundMltProd) { + // Cannot recover, replace with blank + int duration = elem.attribute("out").toInt() - elem.attribute("in").toInt(); + elem.setAttribute("length", duration); + elem.setTagName("blank"); + m_documentErrors.append(i18n("Broken clip producer %1, removed from project", id) + '\n'); + } } m_doc->setModified(true); } @@ -628,14 +743,13 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked) 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); if (locked) item->setItemLocked(true); clip->addReference(); position += (out - in + 1); - kDebug() << "/////////\n\n\n" << "CLIP SPEED: " << speed << ", " << strobe << "\n\n\n/////////////////////"; if (speed != 1.0 || strobe > 1) { QDomElement speedeffect = MainWindow::videoEffects.getEffectByTag(QString(), "speed").cloneNode().toElement(); EffectsList::setParameter(speedeffect, "speed", QString::number((int)(100 * speed + 0.5))); @@ -645,196 +759,259 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked) } // parse clip effects - QDomNodeList effects = elem.childNodes(); - for (int ix = 0; ix < effects.count(); ix++) { - QDomElement effect = effects.at(ix).toElement(); - if (effect.tagName() == "filter") { - // add effect to clip - QString effecttag; - QString effectid; - QString effectindex; - QString ladspaEffectFile; - // Get effect tag & index - for (QDomNode n3 = effect.firstChild(); !n3.isNull(); n3 = n3.nextSibling()) { - // parse effect parameters - QDomElement effectparam = n3.toElement(); - if (effectparam.attribute("name") == "tag") { - effecttag = effectparam.text(); - } else if (effectparam.attribute("name") == "kdenlive_id") { - effectid = effectparam.text(); - } else if (effectparam.attribute("name") == "kdenlive_ix") { - effectindex = effectparam.text(); - } 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); - 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 - QString 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"); - break; - } - } - QString keyframes; - int effectin = effect.attribute("in").toInt(); - int effectout = effect.attribute("out").toInt(); - double startvalue = 0; - double endvalue = 0; - double fact; - if (factor.isEmpty()) fact = 1; - else if (factor.startsWith('%')) { - fact = ProfilesDialog::getStringEval(m_doc->mltProfile(), factor); - } 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; - if (effectparam.attribute("name") == endtag) - endvalue = effectparam.text().toDouble() * fact; - } - // 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(); - ix--; - continueParsing = false; - break; - } else if (subeffectparam.attribute("name") == endtag) { - endvalue = subeffectparam.text().toDouble() * fact; - break; - } - } - if (continueParsing) { - keyframes.append(QString::number(effectout) + ':' + QString::number(endvalue) + ';'); - ix++; - } - } + QDomNodeList effects = elem.elementsByTagName("filter"); + slotAddProjectEffects(effects, elem, item, -1); + } + } + } + kDebug() << "************* ADD DOC TRACK " << ix << ", DURATION: " << position; + return position; +} - 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; - } - } else { - // Check if effect has in/out points - if (effect.hasAttribute("in")) { - EffectsList::setParameter(currenteffect, "in", effect.attribute("in")); - } - if (effect.hasAttribute("out")) { - EffectsList::setParameter(currenteffect, "out", effect.attribute("out")); - } - } +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(); + if (effect.tagName() != "filter") continue; + effectNb++; + // 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()) { + // parse effect parameters + QDomElement effectparam = n3.toElement(); + if (effectparam.attribute("name") == "tag") { + 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); + } + } + //kDebug() << "+ + CLIP EFF FND: " << effecttag << ", " << effectid << ", " << effectindex; + // get effect standard tags + 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)); + if (parentNode.removeChild(effects.at(ix)).isNull()) kDebug() << "/// PROBLEM REMOVING EFFECT: " << effecttag; + ix--; + } 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)) { + //kDebug() << " * * * * * * * * * * ** CLIP EFF WITH KFR FND * * * * * * * * * * *"; + // effect is key-framable, read all effects to retrieve keyframes + 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(); + if (e.attribute("type") == "keyframe") { + starttag = e.attribute("starttag", "start"); + endtag = e.attribute("endtag", "end"); + factor = e.attribute("factor", "1"); + offset = e.attribute("offset", "0").toDouble(); + break; + } + } + QString keyframes; + int effectin = effect.attribute("in").toInt(); + int effectout = effect.attribute("out").toInt(); + double startvalue = 0; + double endvalue = 0; + double fact; + if (factor.contains('%')) { + fact = ProfilesDialog::getStringEval(m_doc->mltProfile(), factor); + } 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 = offset + effectparam.text().toDouble() * fact; + if (effectparam.attribute("name") == endtag) + endvalue = offset + effectparam.text().toDouble() * fact; + } + // add first keyframe + if (effectout <= effectin) { + // there is only one keyframe + 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); + 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(); + ix--; + continueParsing = false; + break; + } else if (subeffectparam.attribute("name") == endtag) { + endvalue = offset + subeffectparam.text().toDouble() * fact; + break; + } + } + if (continueParsing) { + keyframes.append(QString::number(effectout) + '=' + locale.toString(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) { - if (e.attribute("factor", "1") != "1") { - QString factor = e.attribute("factor", "1"); - double fact; - if (factor.startsWith('%')) { - fact = ProfilesDialog::getStringEval(m_doc->mltProfile(), factor); - } else fact = factor.toDouble(); - if (e.attribute("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 e.setAttribute("value", paramvalue.toDouble() * fact); - } else e.setAttribute("value", paramvalue); - break; - } - } - } - if (effecttag == "ladspa") { - //QString ladspaEffectFile = EffectsList::parameter(effect, "src", "property"); + 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; + } + } else { + // Check if effect has in/out points + if (effect.hasAttribute("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")); + 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(); + + if (regionFilter && paramname.startsWith("filter")) { + regionEffects.insert(paramname, paramvalue); + continue; + } - 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); - } - item->addEffect(currenteffect, false); - item->effectsCounter(); + // 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; } } - //m_clipList.append(clip); + + if (disableeffect) currenteffect.setAttribute("disable", "1"); + if (clip) + clip->addEffect(currenteffect, false); + else + m_doc->addTrackEffect(trackIndex, currenteffect); } } - //m_trackDuration = position; +} - //documentTracks.insert(ix, track); - kDebug() << "************* ADD DOC TRACK " << ix << ", DURATION: " << position; - return position; - //track->show(); +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; + } + } } -DocClipBase *TrackView::getMissingProducer(const QString id) const + +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; QDomDocument doc = m_doc->toXml(); @@ -842,27 +1019,50 @@ DocClipBase *TrackView::getMissingProducer(const QString id) const if (!docRoot.endsWith('/')) docRoot.append('/'); QDomNodeList prods = doc.elementsByTagName("producer"); int maxprod = prods.count(); - for (int i = 0; i < maxprod; i++) { + bool slowmotionClip = false; + for (int i = 0; i < maxprod; ++i) { QDomNode m = prods.at(i); QString prodId = m.toElement().attribute("id"); + if (prodId.startsWith("slowmotion")) { + slowmotionClip = true; + prodId = prodId.section(':', 1, 1); + } + prodId = prodId.section('_', 0, 0); if (prodId == id) { missingXml = m.toElement(); break; } } - if (missingXml == QDomElement()) return NULL; - - QDomNodeList params = missingXml.childNodes(); - QString resource; - for (int j = 0; j < params.count(); j++) { - QDomElement e = params.item(j).toElement(); - if (e.attribute("name") == "resource") { - resource = e.firstChild().nodeValue(); - break; + if (missingXml == QDomElement()) { + // Check if producer id was replaced in another track + if (m_replacementProducerIds.contains(id)) { + QString newId = m_replacementProducerIds.value(id); + slowmotionClip = false; + for (int i = 0; i < maxprod; ++i) { + QDomNode m = prods.at(i); + QString prodId = m.toElement().attribute("id"); + if (prodId.startsWith("slowmotion")) { + slowmotionClip = true; + prodId = prodId.section(':', 1, 1); + } + prodId = prodId.section('_', 0, 0); + if (prodId == id) { + missingXml = m.toElement(); + break; + } + } } } + if (missingXml == QDomElement()) return NULL; + QString resource = EffectsList::property(missingXml, "resource"); + QString service = EffectsList::property(missingXml, "mlt_service"); + + 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('/') && !resource.startsWith("0x")) 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); @@ -903,8 +1103,10 @@ void TrackView::slotVerticalZoomDown() if (m_verticalZoom == 0) return; m_verticalZoom--; m_doc->setZoom(m_doc->zoom().x(), m_verticalZoom); - if (m_verticalZoom == 0) m_trackview->setScale(m_scene->scale().x(), 0.5); - else m_trackview->setScale(m_scene->scale().x(), 1); + if (m_verticalZoom == 0) + m_trackview->setScale(m_scene->scale().x(), 0.5); + else + m_trackview->setScale(m_scene->scale().x(), 1); adjustTrackHeaders(); m_trackview->verticalScrollBar()->setValue(headers_area->verticalScrollBar()->value()); } @@ -914,8 +1116,10 @@ void TrackView::slotVerticalZoomUp() if (m_verticalZoom == 2) return; m_verticalZoom++; m_doc->setZoom(m_doc->zoom().x(), m_verticalZoom); - if (m_verticalZoom == 2) m_trackview->setScale(m_scene->scale().x(), 2); - else m_trackview->setScale(m_scene->scale().x(), 1); + if (m_verticalZoom == 2) + m_trackview->setScale(m_scene->scale().x(), 2); + else + m_trackview->setScale(m_scene->scale().x(), 1); adjustTrackHeaders(); m_trackview->verticalScrollBar()->setValue(headers_area->verticalScrollBar()->value()); } @@ -926,19 +1130,75 @@ void TrackView::updateProjectFps() m_trackview->updateProjectFps(); } -void TrackView::slotRenameTrack(int ix) +void TrackView::slotRenameTrack(int ix, const QString &name) { int tracknumber = m_doc->tracksCount() - ix; - TrackInfo info = m_doc->trackInfoAt(tracknumber - 1); - bool ok; - QString newName = QInputDialog::getText(this, i18n("New Track Name"), i18n("Enter new name"), QLineEdit::Normal, info.trackName, &ok); - if (ok) { - info.trackName = newName; - m_doc->setTrackType(tracknumber - 1, info); - QTimer::singleShot(300, this, SLOT(slotReloadTracks())); - m_doc->setModified(true); + QList tracks = m_doc->tracksList(); + tracks[tracknumber - 1].trackName = name; + ConfigTracksCommand *configTracks = new ConfigTracksCommand(m_trackview, m_doc->tracksList(), tracks); + m_doc->commandStack()->push(configTracks); + m_doc->setModified(true); +} + +void TrackView::slotUpdateVerticalScroll(int /*min*/, int max) +{ + int height = 0; + if (max > 0) height = m_trackview->horizontalScrollBar()->height() - 1; + headers_container->layout()->setContentsMargins(0, m_trackview->frameWidth(), 0, height); +} + +void TrackView::updateRuler() +{ + m_ruler->update(); +} + +void TrackView::slotShowTrackEffects(int ix) +{ + m_trackview->clearSelection(); + emit showTrackEffects(m_doc->tracksCount() - ix, m_doc->trackInfoAt(m_doc->tracksCount() - ix - 1)); +} + +void TrackView::slotUpdateTrackEffectState(int ix) +{ + QList widgets = findChildren(); + if (ix < 0 || ix >= widgets.count()) { + kDebug() << "ERROR, Trying to access a non existant track: " << ix; + return; } + widgets.at(m_doc->tracksCount() - ix - 1)->updateEffectLabel(m_doc->trackInfoAt(ix).effectsList.effectNames()); } +void TrackView::slotSaveTimelinePreview(const QString &path) +{ + QImage img(width(), height(), QImage::Format_ARGB32_Premultiplied); + img.fill(palette().base().color().rgb()); + QPainter painter(&img); + render(&painter); + painter.end(); + img = img.scaledToWidth(600, Qt::SmoothTransformation); + 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" + + +