X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftrackview.cpp;h=0ed52e0984eba2e69bdf3cd531399bef574d978f;hb=2b46b701a1a20a5daa519e6201e051fabca198ad;hp=659891266154c40fcfc183cf4422af867c34c8cb;hpb=d67cf79fe91cb8a0d9b31a2800f68697b79983b3;p=kdenlive diff --git a/src/trackview.cpp b/src/trackview.cpp index 65989126..0ed52e09 100644 --- a/src/trackview.cpp +++ b/src/trackview.cpp @@ -30,20 +30,22 @@ #include "mainwindow.h" #include "customtrackview.h" #include "initeffects.h" +#include "profilesdialog.h" #include #include #include -TrackView::TrackView(KdenliveDoc *doc, QWidget *parent) : +TrackView::TrackView(KdenliveDoc *doc, bool *ok, QWidget *parent) : QWidget(parent), m_scale(1.0), m_projectTracks(0), - m_doc(doc) + m_doc(doc), + m_verticalZoom(1) { - view.setupUi(this); + m_view.setupUi(this); m_scene = new CustomTrackScene(doc); m_trackview = new CustomTrackView(doc, m_scene, parent); @@ -54,44 +56,71 @@ 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); + + QString style1 = "QToolButton {border-style: none;margin: 0px 3px;padding: 0px;} QToolButton:pressed:hover { background-color: rgba(224, 224, 0, 100); border-style: inset; border:1px solid #cc6666;border-radius: 3px;} QToolButton:hover { background-color: rgba(255, 255, 255, 100); border-style: inset; border:1px solid #cc6666;border-radius: 3px;}"; + + QToolButton *butSmall = new QToolButton(this); + butSmall->setIcon(KIcon("kdenlive-zoom-small")); + butSmall->setToolTip(i18n("Smaller tracks")); + 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")); + connect(butLarge, SIGNAL(clicked()), this, SLOT(slotVerticalZoomUp())); + sizeLayout->addWidget(butLarge); + m_view.size_frame->setStyleSheet(style1); + + 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_headersLayout = new QVBoxLayout; - m_headersLayout->setContentsMargins(0, 0, 0, 0); + m_headersLayout->setContentsMargins(0, m_trackview->frameWidth(), 0, 0); m_headersLayout->setSpacing(0); - view.headers_container->setLayout(m_headersLayout); + m_view.headers_container->setLayout(m_headersLayout); - connect(view.headers_area->verticalScrollBar(), SIGNAL(valueChanged(int)), m_trackview->verticalScrollBar(), SLOT(setValue(int))); + 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 { @@ -118,11 +147,6 @@ 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) { m_trackview->setDuration(dur); @@ -210,7 +234,7 @@ void TrackView::parseDocument(QDomDocument doc) 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 @@ -240,18 +264,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; @@ -260,8 +286,7 @@ 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.count(';') == 1) { mlt_geometry.remove(QChar('%'), Qt::CaseInsensitive); @@ -283,7 +308,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(); @@ -301,7 +326,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); } } @@ -349,9 +378,14 @@ void TrackView::parseDocument(QDomDocument doc) // 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); @@ -373,12 +407,21 @@ void TrackView::moveCursorPos(int pos) m_trackview->setCursorPos(pos, false); } -void TrackView::slotChangeZoom(int factor) +void TrackView::slotChangeZoom(int horizontal, int vertical) { - 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); + 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 @@ -403,11 +446,15 @@ void TrackView::refresh() void TrackView::slotRebuildTrackHeaders() { QList list = m_doc->tracksList(); - QList widgets = findChildren(); - qDeleteAll(widgets); + QLayoutItem *child; + while ((child = m_headersLayout->takeAt(0)) != 0) { + if (child->widget()) delete child->widget(); + delete child; + } int max = list.count(); + int height = KdenliveSettings::trackheight() * m_scene->scale().y(); for (int i = 0; i < max; i++) { - HeaderTrack *header = new HeaderTrack(i, list.at(max - i - 1), this); + HeaderTrack *header = new HeaderTrack(i, list.at(max - i - 1), height, this); 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))); @@ -417,10 +464,19 @@ void TrackView::slotRebuildTrackHeaders() connect(header, SIGNAL(changeTrack(int)), this, SIGNAL(changeTrack(int))); m_headersLayout->addWidget(header); } - view.headers_container->adjustSize(); } +void TrackView::adjustTrackHeaders() +{ + int height = KdenliveSettings::trackheight() * m_scene->scale().y(); + QLayoutItem *child; + for (int i = 0; i < m_headersLayout->count(); i++) { + child = m_headersLayout->itemAt(i); + if (child->widget())(static_cast (child->widget()))->adjustSize(height); + } +} + int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked) { // parse track @@ -437,7 +493,7 @@ 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 || m_invalidProducers.contains(elem.attribute("producer"))) { + 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--; @@ -446,20 +502,23 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked) 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, + // 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 + // placeholder color clip QDomDocument doc; QDomElement producerXml = doc.createElement("producer"); doc.appendChild(producerXml); @@ -488,14 +547,22 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked) 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(); @@ -546,7 +613,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 = 0; + QString factor; QString starttag; QString endtag; QDomNodeList params = currenteffect.elementsByTagName("parameter"); @@ -555,7 +622,7 @@ 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; } } @@ -564,13 +631,18 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked) 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() * 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) + ';'); @@ -593,7 +665,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; } } @@ -634,9 +706,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; } @@ -696,8 +772,8 @@ DocClipBase *TrackView::getMissingProducer(const QString id) const break; } } - // prepend westley document root if no path in clip resource and not a color clip - if (!resource.contains('/') && !resource.startsWith("0x")) 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); @@ -730,5 +806,33 @@ void TrackView::slotChangeTrackLock(int ix, bool lock) 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(); + /*KdenliveSettings::setTrackheight(KdenliveSettings::trackheight() / 2); + m_trackview->checkTrackHeight(false);*/ +} + +void TrackView::slotVerticalZoomUp() +{ + if (m_verticalZoom == 2) return; + m_verticalZoom++; + m_doc->setZoom(m_doc->zoom().x(), m_verticalZoom); + /*KdenliveSettings::setTrackheight(KdenliveSettings::trackheight() * 2); + m_trackview->checkTrackHeight(false);*/ + if (m_verticalZoom == 2) m_trackview->setScale(m_scene->scale().x(), 2); + else m_trackview->setScale(m_scene->scale().x(), 1); + adjustTrackHeaders(); +} + +void TrackView::updateProjectFps() +{ + m_ruler->updateProjectFps(m_doc->timecode()); +} #include "trackview.moc"