X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftrackview.cpp;h=e790a4c1c0e3bf01690381651250980be004c682;hb=7d1f818376b25f793ad6e8960b73a24a39605945;hp=c1f66bad8edfd218f6ba77705d880a1ca546d4ac;hpb=c69ac32e6d351f7ceb968fd000eb67ea5a377db3;p=kdenlive diff --git a/src/trackview.cpp b/src/trackview.cpp index c1f66bad..e790a4c1 100644 --- a/src/trackview.cpp +++ b/src/trackview.cpp @@ -18,14 +18,9 @@ ***************************************************************************/ -#include - -#include -#include - +#include "trackview.h" #include "definitions.h" #include "headertrack.h" -#include "trackview.h" #include "clipitem.h" #include "transition.h" #include "kdenlivesettings.h" @@ -35,12 +30,23 @@ #include "mainwindow.h" #include "customtrackview.h" #include "initeffects.h" +#include "profilesdialog.h" + +#include +#include -TrackView::TrackView(KdenliveDoc *doc, QWidget *parent) - : QWidget(parent), m_doc(doc), m_scale(1.0), m_projectTracks(0) { +#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) +{ - view = new Ui::TimeLine_UI(); - view->setupUi(this); + m_view.setupUi(this); m_scene = new CustomTrackScene(doc); m_trackview = new CustomTrackView(doc, m_scene, parent); @@ -51,78 +57,105 @@ TrackView::TrackView(KdenliveDoc *doc, QWidget *parent) 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; - int right_margin; - layout->getContentsMargins(&left_margin, 0, &right_margin, 0); - layout->setContentsMargins(left_margin, 0, right_margin, 0); + layout->setContentsMargins(m_trackview->frameWidth(), 0, 0, 0); + layout->setSpacing(0); + m_view.ruler_frame->setLayout(layout); layout->addWidget(m_ruler); + QHBoxLayout *sizeLayout = new QHBoxLayout; + sizeLayout->setContentsMargins(0, 0, 0, 0); + sizeLayout->setSpacing(0); + m_view.size_frame->setLayout(sizeLayout); + + QToolButton *butSmall = new QToolButton(this); + butSmall->setIcon(KIcon("kdenlive-zoom-small")); + butSmall->setToolTip(i18n("Smaller tracks")); + butSmall->setAutoRaise(true); + connect(butSmall, SIGNAL(clicked()), this, SLOT(slotVerticalZoomDown())); + sizeLayout->addWidget(butSmall); + + QToolButton *butLarge = new QToolButton(this); + butLarge->setIcon(KIcon("kdenlive-zoom-large")); + butLarge->setToolTip(i18n("Bigger tracks")); + butLarge->setAutoRaise(true); + connect(butLarge, SIGNAL(clicked()), this, SLOT(slotVerticalZoomUp())); + sizeLayout->addWidget(butLarge); + QHBoxLayout *tracksLayout = new QHBoxLayout; tracksLayout->setContentsMargins(0, 0, 0, 0); - view->tracks_frame->setLayout(tracksLayout); + tracksLayout->setSpacing(0); + m_view.tracks_frame->setLayout(tracksLayout); - view->headers_area->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - view->headers_area->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + m_view.headers_area->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + m_view.headers_area->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + m_view.headers_area->setFixedWidth(70); - m_headersLayout = new QVBoxLayout; - m_headersLayout->setContentsMargins(0, 0, 0, 0); - m_headersLayout->setSpacing(0); - view->headers_container->setLayout(m_headersLayout); - - connect(view->headers_area->verticalScrollBar(), SIGNAL(valueChanged(int)), m_trackview->verticalScrollBar(), SLOT(setValue(int))); + QVBoxLayout *headersLayout = new QVBoxLayout; + headersLayout->setContentsMargins(0, m_trackview->frameWidth(), 0, 0); + headersLayout->setSpacing(0); + m_view.headers_container->setLayout(headersLayout); + connect(m_view.headers_area->verticalScrollBar(), SIGNAL(valueChanged(int)), m_trackview->verticalScrollBar(), SLOT(setValue(int))); tracksLayout->addWidget(m_trackview); - - connect(m_trackview->verticalScrollBar(), SIGNAL(valueChanged(int)), view->headers_area->verticalScrollBar(), SLOT(setValue(int))); + connect(m_trackview->verticalScrollBar(), SIGNAL(valueChanged(int)), m_view.headers_area->verticalScrollBar(), SLOT(setValue(int))); connect(m_trackview, SIGNAL(trackHeightChanged()), this, SLOT(slotRebuildTrackHeaders())); parseDocument(m_doc->toXml()); - m_doc->setSceneList(); + int error = m_doc->setSceneList(); + if (error == -1) *ok = false; + else *ok = true; connect(m_trackview, SIGNAL(cursorMoved(int, int)), m_ruler, SLOT(slotCursorMoved(int, int))); connect(m_trackview->horizontalScrollBar(), SIGNAL(valueChanged(int)), m_ruler, SLOT(slotMoveRuler(int))); connect(m_trackview, SIGNAL(mousePosition(int)), this, SIGNAL(mousePosition(int))); - connect(m_trackview, SIGNAL(transitionItemSelected(Transition*, bool)), this, SLOT(slotTransitionItemSelected(Transition*, bool))); connect(m_trackview, SIGNAL(doTrackLock(int, bool)), this, SLOT(slotChangeTrackLock(int, bool))); - slotChangeZoom(m_doc->zoom()); + slotChangeZoom(m_doc->zoom().x(), m_doc->zoom().y()); slotSetZone(m_doc->zone()); } +TrackView::~TrackView() +{ + delete m_ruler; + delete m_trackview; +} -int TrackView::duration() const { +int TrackView::duration() const +{ return m_trackview->duration(); } -int TrackView::tracksNumber() const { +int TrackView::tracksNumber() const +{ return m_projectTracks - 1; } -int TrackView::inPoint() const { +int TrackView::inPoint() const +{ return m_ruler->inPoint(); } -int TrackView::outPoint() const { +int TrackView::outPoint() const +{ return m_ruler->outPoint(); } -void TrackView::slotSetZone(QPoint p) { +void TrackView::slotSetZone(QPoint p) +{ m_ruler->setZone(p); } -void TrackView::slotTransitionItemSelected(Transition *t, bool update) { - emit transitionItemSelected(t, update); -} - -void TrackView::setDuration(int dur) { +void TrackView::setDuration(int dur) +{ m_trackview->setDuration(dur); m_ruler->setDuration(dur); } -void TrackView::parseDocument(QDomDocument doc) { - int cursorPos = 0; +void TrackView::parseDocument(QDomDocument doc) +{ + //int cursorPos = 0; m_documentErrors.clear(); - // kDebug() << "//// DOCUMENT: " << doc.toString(); + + //kDebug() << "//// DOCUMENT: " << doc.toString(); /*QDomNode props = doc.elementsByTagName("properties").item(0); if (!props.isNull()) { cursorPos = props.toElement().attribute("timeline_position").toInt(); @@ -139,7 +172,40 @@ void TrackView::parseDocument(QDomDocument doc) { QDomElement p; int pos = m_projectTracks - 1; - + m_invalidProducers.clear(); + QDomNodeList producers = doc.elementsByTagName("producer"); + for (int i = 0; i < producers.count(); i++) { + // Check for invalid producers + QDomNode n = producers.item(i); + e = n.toElement(); + + /* + // Check for invalid markup + QDomNodeList params = e.elementsByTagName("property"); + for (int j = 0; j < params.count(); j++) { + QDomElement p = params.item(j).toElement(); + if (p.attribute("name") == "markup") { + QString val = p.text().toUtf8().data(); + kDebug()<<"//FOUND MARKUP, VAL: "< out || in == out) { + // invalid producer, remove it + QString id = e.attribute("id"); + m_invalidProducers.append(id); + m_documentErrors.append(i18n("Invalid clip producer %1\n", id)); + doc.documentElement().removeChild(producers.at(i)); + i--; + } + } for (int i = 0; i < m_projectTracks; i++) { e = tracks.item(i).toElement(); @@ -162,9 +228,10 @@ void TrackView::parseDocument(QDomDocument doc) { m_doc->switchTrackVideo(i - 1, true); m_doc->switchTrackAudio(i - 1, true); } + trackduration = slotAddProjectTrack(pos, p, m_doc->isTrackLocked(i - 1)); pos--; - //kDebug() << " PRO DUR: " << trackduration << ", TRACK DUR: " << duration; + //kDebug() << " PRO DUR: " << trackduration << ", TRACK DUR: " << duration; if (trackduration > duration) duration = trackduration; } else { // background black track @@ -194,18 +261,20 @@ void TrackView::parseDocument(QDomDocument doc) { bool forceTrack = false; QString mlt_geometry; QString mlt_service; + QString transitionId; 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 + // do not add audio mixing transitions 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 (paramName == "a_track") a_track = p.text().toInt(); else if (paramName == "b_track") b_track = p.text().toInt(); else if (paramName == "mlt_service") mlt_service = p.text(); + else if (paramName == "kdenlive_id") transitionId = p.text(); else if (paramName == "geometry") mlt_geometry = p.text(); else if (paramName == "automatic" && p.text() == "1") isAutomatic = true; else if (paramName == "force_track" && p.text() == "1") forceTrack = true; @@ -214,11 +283,9 @@ void TrackView::parseDocument(QDomDocument doc) { if (transitionAdd || mlt_service != "mix") { // Transition should be added to the scene ItemInfo transitionInfo; - QString transitionId; - if (mlt_service == "composite") { + if (mlt_service == "composite" && transitionId.isEmpty()) { // When adding composite transition, check if it is a wipe transition - if (mlt_geometry == "0%,0%:100%x100%") transitionId = "alphatransparency"; - else if (mlt_geometry.count(';') == 1) { + if (mlt_geometry.count(';') == 1) { mlt_geometry.remove(QChar('%'), Qt::CaseInsensitive); mlt_geometry.replace(QChar('x'), QChar(','), Qt::CaseInsensitive); QString start = mlt_geometry.section(';', 0, 0); @@ -238,7 +305,7 @@ void TrackView::parseDocument(QDomDocument doc) { break; } } - if (isWipeTransition) transitionId = "wipe"; + if (isWipeTransition) transitionId = "slide"; } } QDomElement base = MainWindow::transitions.getEffectByTag(mlt_service, transitionId).cloneNode().toElement(); @@ -256,7 +323,11 @@ void TrackView::parseDocument(QDomDocument doc) { if (e.attribute("type") == "double") { QString factor = e.attribute("factor", "1"); if (factor != "1") { - double val = paramValue.toDouble() * factor.toDouble(); + 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); } } @@ -285,7 +356,7 @@ void TrackView::parseDocument(QDomDocument doc) { Transition *tr = new Transition(transitionInfo, a_track, m_doc->fps(), base, isAutomatic); if (forceTrack) tr->setForcedTrack(true, a_track); m_scene->addItem(tr); - if (m_doc->isTrackLocked(b_track - 1)) { + if (b_track > 0 && m_doc->isTrackLocked(b_track - 1)) { tr->setItemLocked(true); } } @@ -301,34 +372,57 @@ void TrackView::parseDocument(QDomDocument doc) { m_trackview->addGuide(pos, comment); } + // Rebuild groups + QDomNodeList groups = doc.elementsByTagName("group"); + m_trackview->loadGroups(groups); m_trackview->setDuration(duration); kDebug() << "/////////// TOTAL PROJECT DURATION: " << duration; + + // 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); //m_trackview->setCursorPos(cursorPos); //m_scrollBox->setGeometry(0, 0, 300 * zoomFactor(), m_scrollArea->height()); } -void TrackView::slotDeleteClip(const QString &clipId) { +void TrackView::slotDeleteClip(const QString &clipId) +{ m_trackview->deleteClip(clipId); } -void TrackView::setCursorPos(int pos) { +void TrackView::setCursorPos(int pos) +{ m_trackview->setCursorPos(pos); } -void TrackView::moveCursorPos(int pos) { +void TrackView::moveCursorPos(int pos) +{ m_trackview->setCursorPos(pos, false); } -void TrackView::slotChangeZoom(int factor) { - m_doc->setZoom(factor); - m_ruler->setPixelPerMark(factor); - m_scale = (double) FRAME_SIZE / m_ruler->comboScale[factor]; // m_ruler->comboScale[m_currentZoom] / - m_trackview->setScale(m_scale); +void TrackView::slotChangeZoom(int horizontal, int vertical) +{ + m_ruler->setPixelPerMark(horizontal); + m_scale = (double) FRAME_SIZE / m_ruler->comboScale[horizontal]; // m_ruler->comboScale[m_currentZoom] / + + if (vertical == -1) { + // user called zoom + m_doc->setZoom(horizontal, m_verticalZoom); + 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); + adjustTrackHeaders(); + } } -int TrackView::fitZoom() const { +int TrackView::fitZoom() const +{ int zoom = (int)((duration() + 20 / m_scale) * FRAME_SIZE / m_trackview->width()); int i; for (i = 0; i < 13; i++) @@ -336,30 +430,38 @@ int TrackView::fitZoom() const { return i; } -const double TrackView::zoomFactor() const { - return m_scale; -} - -const int TrackView::mapLocalToValue(int x) const { - return (int)(x * zoomFactor()); -} - -KdenliveDoc *TrackView::document() { +KdenliveDoc *TrackView::document() +{ return m_doc; } -void TrackView::refresh() { +void TrackView::refresh() +{ m_trackview->viewport()->update(); } -void TrackView::slotRebuildTrackHeaders() { - QList list = m_doc->tracksList(); - QList widgets = this->findChildren(); - for (int i = 0; i < widgets.count(); i++) - delete widgets.at(i); +void TrackView::slotRebuildTrackHeaders() +{ + const QList list = m_doc->tracksList(); + QLayoutItem *child; + while ((child = m_view.headers_container->layout()->takeAt(0)) != 0) { + QWidget *wid = child->widget(); + delete child; + if (wid) wid->deleteLater(); + } int max = list.count(); + int height = KdenliveSettings::trackheight() * m_scene->scale().y() - 1; + HeaderTrack *header = NULL; + QFrame *frame = NULL; for (int i = 0; i < max; i++) { - HeaderTrack *header = new HeaderTrack(i, list.at(max - i - 1), this); + frame = new QFrame(m_view.headers_container); + frame->setFixedHeight(1); + frame->setFrameStyle(QFrame::Plain); + frame->setFrameShape(QFrame::Box); + frame->setLineWidth(1); + m_view.headers_container->layout()->addWidget(frame); + TrackInfo info = list.at(max - i - 1); + header = new HeaderTrack(i, info, height, m_view.headers_container); 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))); @@ -367,17 +469,35 @@ void TrackView::slotRebuildTrackHeaders() { 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))); - m_headersLayout->addWidget(header); + connect(header, SIGNAL(renameTrack(int)), this, SLOT(slotRenameTrack(int))); + m_view.headers_container->layout()->addWidget(header); } - view->headers_container->adjustSize(); + frame = new QFrame(this); + frame->setFixedHeight(1); + frame->setFrameStyle(QFrame::Plain); + frame->setFrameShape(QFrame::Box); + frame->setLineWidth(1); + m_view.headers_container->layout()->addWidget(frame); } -int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked) { - int trackTop = KdenliveSettings::trackheight() * ix; +void TrackView::adjustTrackHeaders() +{ + int height = KdenliveSettings::trackheight() * m_scene->scale().y() - 1; + QLayoutItem *child; + for (int i = 0; i < m_view.headers_container->layout()->count(); i++) { + child = m_view.headers_container->layout()->itemAt(i); + if (child->widget() && child->widget()->height() > 5)(static_cast (child->widget()))->adjustSize(height); + } +} + +int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked) +{ // parse track int position = 0; - for (QDomNode n = xml.firstChild(); !n.isNull(); n = n.nextSibling()) { + QDomNodeList children = xml.childNodes(); + for (int nodeindex = 0; nodeindex < children.count(); nodeindex++) { + QDomNode n = children.item(nodeindex); QDomElement elem = n.toElement(); if (elem.tagName() == "blank") { position += elem.attribute("length").toInt(); @@ -387,30 +507,76 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked) { // Found a clip int in = elem.attribute("in").toInt(); int out = elem.attribute("out").toInt(); - if (in > out || in == out) { + if (in > out || /*in == out ||*/ m_invalidProducers.contains(elem.attribute("producer"))) { m_documentErrors.append(i18n("Invalid clip removed from track %1 at %2\n", ix, position)); + xml.removeChild(children.at(nodeindex)); + nodeindex--; continue; } QString idString = elem.attribute("producer"); QString id = idString; double speed = 1.0; + int strobe = 1; if (idString.startsWith("slowmotion")) { id = idString.section(':', 1, 1); speed = idString.section(':', 2, 2).toDouble(); + strobe = idString.section(':', 3, 3).toInt(); + if (strobe == 0) strobe = 1; } else 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) { + // 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()); + } + m_doc->setModified(true); + } + if (clip != NULL) { ItemInfo clipinfo; clipinfo.startPos = GenTime(position, m_doc->fps()); clipinfo.endPos = clipinfo.startPos + GenTime(out - in + 1, m_doc->fps()); clipinfo.cropStart = GenTime(in, m_doc->fps()); clipinfo.track = ix; - //kDebug() << "// INSERTING CLIP: " << in << "x" << out << ", track: " << ix << ", ID: " << id << ", SCALE: " << m_scale << ", FPS: " << m_doc->fps(); - ClipItem *item = new ClipItem(clip, clipinfo, m_doc->fps(), speed, false); + //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); + 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))); + EffectsList::setParameter(speedeffect, "strobe", QString::number(strobe)); + item->addEffect(speedeffect, false); + item->effectsCounter(); + } // parse clip effects QDomNodeList effects = elem.childNodes(); @@ -461,7 +627,7 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked) { if (MainWindow::videoEffects.hasKeyFrames(currenteffect)) { //kDebug() << " * * * * * * * * * * ** CLIP EFF WITH KFR FND * * * * * * * * * * *"; // effect is key-framable, read all effects to retrieve keyframes - double factor; + QString factor; QString starttag; QString endtag; QDomNodeList params = currenteffect.elementsByTagName("parameter"); @@ -470,22 +636,27 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked) { if (e.attribute("type") == "keyframe") { starttag = e.attribute("starttag", "start"); endtag = e.attribute("endtag", "end"); - factor = e.attribute("factor", "1").toDouble(); + factor = e.attribute("factor", "1"); break; } } QString keyframes; int effectin = effect.attribute("in").toInt(); int effectout = effect.attribute("out").toInt(); - double startvalue; - double endvalue; + 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() * factor; + startvalue = effectparam.text().toDouble() * fact; if (effectparam.attribute("name") == endtag) - endvalue = effectparam.text().toDouble() * factor; + endvalue = effectparam.text().toDouble() * fact; } // add first keyframe keyframes.append(QString::number(effectin) + ':' + QString::number(startvalue) + ';' + QString::number(effectout) + ':' + QString::number(endvalue) + ';'); @@ -508,7 +679,7 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked) { continueParsing = false; break; } else if (subeffectparam.attribute("name") == endtag) { - endvalue = subeffectparam.text().toDouble() * factor; + endvalue = subeffectparam.text().toDouble() * fact; break; } } @@ -549,9 +720,13 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked) { for (int k = 0; k < clipeffectparams.count(); k++) { e = clipeffectparams.item(k).toElement(); if (!e.isNull() && e.tagName() == "parameter" && e.attribute("name") == paramname) { - double factor = e.attribute("factor", "1").toDouble(); - if (factor != 1) { - e.setAttribute("value", paramvalue.toDouble() * factor); + 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(); + e.setAttribute("value", paramvalue.toDouble() * fact); } else e.setAttribute("value", paramvalue); break; } @@ -571,38 +746,6 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked) { } } } - } else { - // The clip in playlist was not listed in the kdenlive producers, - // something went wrong, repair required. - kWarning() << "CANNOT INSERT CLIP " << id; - int out = elem.attribute("out").toInt(); - - ItemInfo clipinfo; - clipinfo.startPos = GenTime(position, m_doc->fps()); - clipinfo.endPos = clipinfo.startPos + GenTime(out - in + 1, m_doc->fps()); - clipinfo.cropStart = GenTime(in, m_doc->fps()); - clipinfo.track = ix; - //kDebug() << "// INSERTING CLIP: " << in << "x" << out << ", track: " << ix << ", ID: " << id << ", SCALE: " << m_scale << ", FPS: " << m_doc->fps(); - - DocClipBase *missingClip = getMissingProducer(id); - if (!missingClip) { - // We cannot find the producer, something is really wrong, add - // placeholder color clip - QDomElement producerXml; - producerXml.setTagName("producer"); - producerXml.setAttribute("resource", "0xff0000ff"); - producerXml.setAttribute("mlt_service", "colour"); - producerXml.setAttribute("length", "15000"); - producerXml.setAttribute("id", id); - missingClip = new DocClipBase(m_doc->clipManager(), producerXml, id); - m_documentErrors.append(i18n("Boken clip producer %1", id) + '\n'); - } else m_documentErrors.append(i18n("Replaced wrong clip producer %1 with %2", id, missingClip->getId()) + '\n'); - ClipItem *item = new ClipItem(missingClip, clipinfo, m_doc->fps(), 1.0, false); - m_scene->addItem(item); - missingClip->addReference(); - position += (out - in + 1); - - m_doc->setModified(true); } //m_clipList.append(clip); } @@ -616,8 +759,9 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked) { //track->show(); } -DocClipBase *TrackView::getMissingProducer(const QString id) const { - QDomElement missingXml = QDomElement(); +DocClipBase *TrackView::getMissingProducer(const QString id) const +{ + QDomElement missingXml; QDomDocument doc = m_doc->toXml(); QString docRoot = doc.documentElement().attribute("root"); if (!docRoot.endsWith('/')) docRoot.append('/'); @@ -635,42 +779,90 @@ DocClipBase *TrackView::getMissingProducer(const QString id) const { QDomNodeList params = missingXml.childNodes(); QString resource; - QString mlt_service; for (int j = 0; j < params.count(); j++) { QDomElement e = params.item(j).toElement(); if (e.attribute("name") == "resource") { resource = e.firstChild().nodeValue(); - } else if (e.attribute("name") == "mlt_service") { - mlt_service = e.firstChild().nodeValue(); + break; } } - resource.prepend(docRoot); + // 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); DocClipBase *missingClip = NULL; - if (!resource.isEmpty()) - missingClip = m_doc->clipManager()->getClipByResource(resource); + if (!resource.isEmpty()) { + QList list = m_doc->clipManager()->getClipByResource(resource); + if (!list.isEmpty()) missingClip = list.at(0); + } return missingClip; } -QGraphicsScene *TrackView::projectScene() { +QGraphicsScene *TrackView::projectScene() +{ return m_scene; } -CustomTrackView *TrackView::projectView() { +CustomTrackView *TrackView::projectView() +{ return m_trackview; } -void TrackView::setEditMode(const QString & editMode) { +void TrackView::setEditMode(const QString & editMode) +{ m_editMode = editMode; } -const QString & TrackView::editMode() const { +const QString & TrackView::editMode() const +{ return m_editMode; } -void TrackView::slotChangeTrackLock(int ix, bool lock) { - QList widgets = this->findChildren(); +void TrackView::slotChangeTrackLock(int ix, bool lock) +{ + QList widgets = findChildren(); widgets.at(ix)->setLock(lock); } +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); + adjustTrackHeaders(); + m_trackview->verticalScrollBar()->setValue(m_view.headers_area->verticalScrollBar()->value()); +} + +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); + adjustTrackHeaders(); + m_trackview->verticalScrollBar()->setValue(m_view.headers_area->verticalScrollBar()->value()); +} + +void TrackView::updateProjectFps() +{ + m_ruler->updateProjectFps(m_doc->timecode()); + m_trackview->updateProjectFps(); +} + +void TrackView::slotRenameTrack(int ix) +{ + 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(slotRebuildTrackHeaders())); + m_doc->setModified(true); + } +} + #include "trackview.moc"