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(clipItemSelected(ClipItem*)), this, SLOT(slotClipItemSelected(ClipItem*)));
- connect(m_trackview, SIGNAL(transitionItemSelected(Transition*)), this, SLOT(slotTransitionItemSelected(Transition*)));
+ connect(m_trackview, SIGNAL(transitionItemSelected(Transition*, bool)), this, SLOT(slotTransitionItemSelected(Transition*, bool)));
slotChangeZoom(m_doc->zoom());
}
}
int TrackView::tracksNumber() const {
- return m_projectTracks;
+ return m_projectTracks - 1;
}
int TrackView::inPoint() const {
return m_ruler->outPoint();
}
-void TrackView::slotClipItemSelected(ClipItem*c) {
- emit clipItemSelected(c);
+void TrackView::slotSetZone(QPoint p) {
+ m_ruler->setZone(p);
}
-void TrackView::slotTransitionItemSelected(Transition *t) {
- emit transitionItemSelected(t);
+void TrackView::slotTransitionItemSelected(Transition *t, bool update) {
+ emit transitionItemSelected(t, update);
}
void TrackView::setDuration(int dur) {
int cursorPos = 0;
m_documentErrors = QString();
// kDebug() << "//// DOCUMENT: " << doc.toString();
- QDomNode props = doc.elementsByTagName("properties").item(0);
+ /*QDomNode props = doc.elementsByTagName("properties").item(0);
if (!props.isNull()) {
cursorPos = props.toElement().attribute("timeline_position").toInt();
- }
+ }*/
// parse project tracks
QDomNodeList tracks = doc.elementsByTagName("track");
int trackduration = 0;
QDomElement e;
QDomElement p;
- bool videotrack;
int pos = m_projectTracks - 1;
p = playlists.item(j).toElement();
if (p.attribute("id") == playlist_name) break;
}
- videotrack = (e.attribute("hide") != "video");
- trackduration = slotAddProjectTrack(pos, p, videotrack);
+ if (e.attribute("hide") == "video") {
+ m_doc->switchTrackVideo(i - 1, true);
+ } else if (e.attribute("hide") == "audio") {
+ m_doc->switchTrackAudio(i - 1, true);
+ } else if (e.attribute("hide") == "both") {
+ m_doc->switchTrackVideo(i - 1, true);
+ m_doc->switchTrackAudio(i - 1, true);
+ }
+ trackduration = slotAddProjectTrack(pos, p);
pos--;
//kDebug() << " PRO DUR: " << trackduration << ", TRACK DUR: " << duration;
if (trackduration > duration) duration = trackduration;
bool transitionAdd = true;
int a_track = 0;
int b_track = 0;
+ bool isAutomatic = false;
+ bool forceTrack = false;
+ QString mlt_geometry;
QString mlt_service;
for (int k = 0; k < transitionparams.count(); k++) {
p = transitionparams.item(k).toElement();
if (paramName == "internal_added" && p.text() == "237") {
transitionAdd = false;
//kDebug() << "// TRANSITRION " << i << " IS NOT VALID (INTERN ADDED)";
- break;
+ //break;
} else if (paramName == "a_track") a_track = p.text().toInt();
- else if (paramName == "b_track") b_track = m_projectTracks - 1 - 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 == "geometry") mlt_geometry = p.text();
+ else if (paramName == "automatic" && p.text() == "1") isAutomatic = true;
+ else if (paramName == "force_track" && p.text() == "1") forceTrack = true;
}
}
- if (transitionAdd) {
+ if (transitionAdd || mlt_service != "mix") {
// Transition should be added to the scene
ItemInfo transitionInfo;
- QDomElement base = MainWindow::transitions.getEffectByTag(mlt_service, QString());
+ QString transitionId;
+ if (mlt_service == "composite") {
+ // 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) {
+ 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);
+ bool isWipeTransition = true;
+ int checkNumber;
+ for (int i = 0; i < numbers.size(); ++i) {
+ checkNumber = qAbs(numbers.at(i).toInt());
+ if (checkNumber != 0 && checkNumber != 100) {
+ isWipeTransition = false;
+ break;
+ }
+ }
+ if (isWipeTransition) transitionId = "wipe";
+ }
+ }
+ QDomElement base = MainWindow::transitions.getEffectByTag(mlt_service, transitionId).cloneNode().toElement();
for (int k = 0; k < transitionparams.count(); k++) {
p = transitionparams.item(k).toElement();
kDebug() << "/////// TRANSITION XML: "<< doc.toString();*/
transitionInfo.startPos = GenTime(e.attribute("in").toInt(), m_doc->fps());
- transitionInfo.endPos = GenTime(e.attribute("out").toInt(), m_doc->fps());
- transitionInfo.track = b_track;
+ transitionInfo.endPos = GenTime(e.attribute("out").toInt() + 1, m_doc->fps());
+ transitionInfo.track = m_projectTracks - 1 - b_track;
//kDebug() << "/////////////// +++++++++++ ADDING TRANSITION ON TRACK: " << b_track << ", TOTAL TRKA: " << m_projectTracks;
- Transition *tr = new Transition(transitionInfo, a_track, m_doc->fps(), base);
+ Transition *tr = new Transition(transitionInfo, a_track, m_doc->fps(), base, isAutomatic);
+ if (forceTrack) tr->setForcedTrack(true, a_track);
m_scene->addItem(tr);
}
}
}
void TrackView::slotRebuildTrackHeaders() {
- QList <TrackInfo> list = m_trackview->tracksList();
+ QList <TrackInfo> list = m_doc->tracksList();
QList<HeaderTrack *> widgets = this->findChildren<HeaderTrack *>();
for (int i = 0; i < widgets.count(); i++)
delete widgets.at(i);
HeaderTrack *header = new HeaderTrack(i, list.at(max - i - 1), this);
connect(header, SIGNAL(switchTrackVideo(int)), m_trackview, SLOT(slotSwitchTrackVideo(int)));
connect(header, SIGNAL(switchTrackAudio(int)), m_trackview, SLOT(slotSwitchTrackAudio(int)));
- connect(header, SIGNAL(deleteTrack(int)), m_trackview, SLOT(slotDeleteTrack(int)));
- connect(header, SIGNAL(insertTrack(int)), m_trackview, SLOT(slotInsertTrack(int)));
+
+ //TODO: re-enable when add / remove track is implemented
+ connect(header, SIGNAL(deleteTrack(int)), this, SIGNAL(deleteTrack(int)));
+ connect(header, SIGNAL(insertTrack(int)), this, SIGNAL(insertTrack(int)));
m_headersLayout->addWidget(header);
}
view->headers_container->adjustSize();
}
-int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool videotrack) {
- TrackInfo info;
-
- if (videotrack) {
- info.type = VIDEOTRACK;
- info.isMute = false;
- info.isBlind = false;
- } else {
- info.type = AUDIOTRACK;
- info.isMute = false;
- info.isBlind = false;
- }
-
- m_trackview->addTrack(info);
+int TrackView::slotAddProjectTrack(int ix, QDomElement xml) {
int trackTop = KdenliveSettings::trackheight() * ix;
// parse track
int position = 0;
hasSpeedAttribute = true;
id = idString.section(":", 1, 1);
speed = idString.section(":", 2, 2).toDouble();
- }
+ } else id = id.section('_', 0, 0);
DocClipBase *clip = m_doc->clipManager()->getClipById(id);
if (clip != NULL) {
int out = elem.attribute("out").toInt();
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());
+ ClipItem *item = new ClipItem(clip, clipinfo, m_doc->fps(), false);
if (hasSpeedAttribute) item->setSpeed(speed);
m_scene->addItem(item);
clip->addReference();
for (int ix = 0; ix < effects.count(); ix++) {
QDomElement effect = effects.at(ix).toElement();
if (effect.tagName() == "filter") {
- kDebug() << " * * * * * * * * * * ** CLIP EFF FND * * * * * * * * * * *";
// add effect to clip
QString effecttag;
QString effectid;
effectindex = effectparam.text();
}
}
-
+ //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);
elem.removeChild(effects.at(ix));
ix--;
} else {
- clipeffect.setAttribute("kdenlive_ix", effectindex);
- QDomNodeList clipeffectparams = clipeffect.childNodes();
+ QDomElement currenteffect = clipeffect.cloneNode().toElement();
+ currenteffect.setAttribute("kdenlive_ix", effectindex);
+ QDomNodeList clipeffectparams = currenteffect.childNodes();
- if (MainWindow::videoEffects.hasKeyFrames(clipeffect)) {
- kDebug() << " * * * * * * * * * * ** CLIP EFF WITH KFR FND * * * * * * * * * * *";
+ if (MainWindow::videoEffects.hasKeyFrames(currenteffect)) {
+ //kDebug() << " * * * * * * * * * * ** CLIP EFF WITH KFR FND * * * * * * * * * * *";
// effect is key-framable, read all effects to retrieve keyframes
double factor;
QString starttag;
QString endtag;
- QDomNodeList params = clipeffect.elementsByTagName("parameter");
+ QDomNodeList params = currenteffect.elementsByTagName("parameter");
for (int i = 0; i < params.count(); i++) {
QDomElement e = params.item(i).toElement();
if (e.attribute("type") == "keyframe") {
endvalue = effectparam.text().toDouble() * factor;
}
// add first keyframe
- keyframes.append(QString::number(in + effectin) + ":" + QString::number(startvalue) + ";" + QString::number(in + effectout) + ":" + QString::number(endvalue) + ";");
+ keyframes.append(QString::number(effectin) + ":" + QString::number(startvalue) + ";" + QString::number(effectout) + ":" + QString::number(endvalue) + ";");
QDomNode lastParsedEffect;
ix++;
QDomNode n2 = effects.at(ix);
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) {
break;
}
}
- if (continueParsing) keyframes.append(QString::number(in + effectout) + ":" + QString::number(endvalue) + ";");
- ix++;
+ if (continueParsing) {
+ keyframes.append(QString::number(effectout) + ":" + QString::number(endvalue) + ";");
+ ix++;
+ }
}
- params = clipeffect.elementsByTagName("parameter");
+ 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"));
+ }
}
// adjust effect parameters
}
}
}
- item->addEffect(clipeffect, false);
+ item->addEffect(currenteffect, false);
item->effectsCounter();
}
}
projects / kdenlive / blobdiff