{
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);
bool hasAudio = false;
const QList <TrackInfo> list = m_doc->tracksList();
int max = list.count();
- for (int i = 0; i < max; i++) {
+ for (int i = 0; i < max; ++i) {
TrackInfo info = list.at(max - i - 1);
if (!info.isMute && m_trackview->hasAudio(i)) {
hasAudio = true;
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();
m_invalidProducers.append(id);
m_documentErrors.append(i18n("Invalid clip producer %1\n", id));
doc.documentElement().removeChild(producers.at(i));
- i--;
+ --i;
}
}
int trackIndex = 0;
- for (int i = 0; i < m_projectTracks; i++) {
+ 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") {
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;
// 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") {
QDomElement base = MainWindow::transitions.getEffectByTag(mlt_service, transitionId).cloneNode().toElement();
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");
- 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);
- }
+ 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");
+ 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();
}
- e.setAttribute("value", paramValue);
- break;
+ paramValue = QLocale().toString(offset + paramValue.toDouble() * fact);
}
}
+ e.setAttribute("value", paramValue);
+ break;
+ }
}
}
+ }
/*QDomDocument doc;
doc.appendChild(doc.importNode(base, true));
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--;
+ --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);
else {
m_documentErrors.append(i18n("Removed overlapping transition: (%1, %2, %3)", e.attribute("id"), mlt_service, transitionId) + '\n');
tractor.removeChild(transitions.item(i));
- i--;
+ --i;
}
}
}
// Add guides
QDomNodeList guides = infoXml.elementsByTagName("guide");
- for (int i = 0; i < guides.count(); i++) {
+ 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());
{
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;
}
void TrackView::slotRepaintTracks()
{
QList<HeaderTrack *> widgets = findChildren<HeaderTrack *>();
- for (int i = 0; i < widgets.count(); i++) {
+ for (int i = 0; i < widgets.count(); ++i) {
if (widgets.at(i)) widgets.at(i)->setSelectedIndex(m_trackview->selectedTrack());
}
}
updatePalette();
- for (int i = 0; i < max; i++) {
+ for (int i = 0; i < max; ++i) {
frame = new QFrame(headers_container);
frame->setFrameStyle(QFrame::HLine);
frame->setFixedHeight(1);
{
int height = KdenliveSettings::trackheight() * m_scene->scale().y() - 1;
QList<HeaderTrack *> widgets = findChildren<HeaderTrack *>();
- for (int i = 0; i < widgets.count(); i++) {
+ 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, QDomNodeList producers)
+int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked, const QDomNodeList &producers)
{
// parse track
int position = 0;
producerReplacementIds.insert(idString, prodId);
// now adjust the mlt producer
bool found = false;
- for (int i = 0; i < producers.count(); i++) {
+ for (int i = 0; i < producers.count(); ++i) {
QDomElement prod = producers.at(i).toElement();
if (prod.attribute("id") == prodId) {
// ok, producer already exists
}
}
if (!found) {
- for (int i = 0; i < producers.count(); i++) {
+ for (int i = 0; i < producers.count(); ++i) {
QDomElement prod = producers.at(i).toElement();
if (prod.attribute("id") == idString) {
prod.setAttribute("id", prodId);
}
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++) {
+ 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 + '_')) {
break;
}
}
- }
+ }
}
else {
// We cannot find the producer, something is really wrong, add
QDomElement producerXml = doc.createElement("producer");
doc.appendChild(producerXml);
bool foundMltProd = false;
- for (int i = 0; i < producers.count(); i++) {
+ 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");
// add effect to clip
QString effecttag;
QString effectid;
- QString effectinfo;
+ QString effectinfo;
QString effectindex = QString::number(effectNb);
// Get effect tag & index
for (QDomNode n3 = effect.firstChild(); !n3.isNull(); n3 = n3.nextSibling()) {
effecttag = effectparam.text();
} else if (effectparam.attribute("name") == "kdenlive_id") {
effectid = effectparam.text();
- } else if (effectparam.attribute("name") == "kdenlive_info") {
+ } else if (effectparam.attribute("name") == "kdenlive_info") {
effectinfo = effectparam.text();
} else if (effectparam.attribute("name") == "disable" && effectparam.text().toInt() == 1) {
// Fix effects index
} else {
QDomElement currenteffect = clipeffect.cloneNode().toElement();
currenteffect.setAttribute("kdenlive_ix", effectindex);
- currenteffect.setAttribute("kdenlive_info", effectinfo);
+ currenteffect.setAttribute("kdenlive_info", effectinfo);
QDomNodeList clipeffectparams = currenteffect.childNodes();
if (MainWindow::videoEffects.hasKeyFrames(currenteffect)) {
QString endtag;
double offset = 0;
QDomNodeList params = currenteffect.elementsByTagName("parameter");
- for (int i = 0; i < params.count(); i++) {
+ for (int i = 0; i < params.count(); ++i) {
QDomElement e = params.item(i).toElement();
if (e.attribute("type") == "keyframe") {
starttag = e.attribute("starttag", "start");
}
params = currenteffect.elementsByTagName("parameter");
- for (int i = 0; i < params.count(); i++) {
+ for (int i = 0; i < params.count(); ++i) {
QDomElement e = params.item(i).toElement();
if (e.attribute("type") == "keyframe") e.setAttribute("keyframes", keyframes);
}
} 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");
+ 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"));
+ 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 <QString, QString> regionEffects;
-
+ bool regionFilter = effecttag == "region";
+ QMap <QString, QString> 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 (regionFilter && paramname.startsWith("filter")) {
+ regionEffects.insert(paramname, paramvalue);
+ continue;
+ }
// try to find this parameter in the effect xml and set its value
adjustparameterValue(clipeffectparams, paramname, paramvalue);
}
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<QString, QString>::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++;
- }
- }
+ // 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<QString, QString>::const_iterator j = regionEffects.constBegin();
+ while (j != regionEffects.constEnd()) {
+ if (j.key().startsWith(QString("filter%1.").arg(i))) {
+ QString pname = j.key().section('.', 1, -1);
+ adjustparameterValue(subclipeffectparams, pname, j.value());
+ }
+ ++j;
+ }
+ currenteffect.appendChild(currenteffect.ownerDocument().importNode(subclipeffect, true));
+ ++i;
+ }
+ }
if (disableeffect) currenteffect.setAttribute("disable", "1");
if (clip)
QDomElement e;
QLocale locale;
for (int k = 0; k < clipeffectparams.count(); k++) {
- e = clipeffectparams.item(k).toElement();
+ e = clipeffectparams.item(k).toElement();
if (!e.isNull() && e.tagName() == "parameter" && e.attribute("name") == paramname) {
- QString type = e.attribute("type");
+ QString type = e.attribute("type");
QString factor = e.attribute("factor", "1");
double fact;
if (factor.contains('%')) {
- fact = ProfilesDialog::getStringEval(m_doc->mltProfile(), factor);
+ fact = ProfilesDialog::getStringEval(m_doc->mltProfile(), factor);
} else {
- fact = factor.toDouble();
+ fact = factor.toDouble();
}
double offset = e.attribute("offset", "0").toDouble();
if (type == "simplekeyframe") {
- QStringList kfrs = paramvalue.split(";");
+ QStringList kfrs = paramvalue.split(";");
for (int l = 0; l < kfrs.count(); l++) {
- QString fr = kfrs.at(l).section('=', 0, 0);
+ 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;
+ bool ok;
e.setAttribute("value", offset + locale.toDouble(paramvalue, &ok) * fact);
if (!ok)
- e.setAttribute("value", paramvalue);
+ e.setAttribute("value", paramvalue);
} else {
- e.setAttribute("value", paramvalue);
+ e.setAttribute("value", paramvalue);
}
break;
}
- }
+ }
}
{
QDomElement clipeffect = MainWindow::customEffects.getEffectByTag(QString(), effectid);
if (clipeffect.isNull()) {
- clipeffect = MainWindow::videoEffects.getEffectByTag(effecttag, effectid);
+ clipeffect = MainWindow::videoEffects.getEffectByTag(effecttag, effectid);
}
if (clipeffect.isNull()) {
- clipeffect = MainWindow::audioEffects.getEffectByTag(effecttag, effectid);
+ clipeffect = MainWindow::audioEffects.getEffectByTag(effecttag, effectid);
}
return clipeffect;
}
QDomNodeList prods = doc.elementsByTagName("producer");
int maxprod = prods.count();
bool slowmotionClip = false;
- for (int i = 0; i < maxprod; i++) {
+ for (int i = 0; i < maxprod; ++i) {
QDomNode m = prods.at(i);
QString prodId = m.toElement().attribute("id");
if (prodId.startsWith("slowmotion")) {
if (m_replacementProducerIds.contains(id)) {
QString newId = m_replacementProducerIds.value(id);
slowmotionClip = false;
- for (int i = 0; i < maxprod; i++) {
+ for (int i = 0; i < maxprod; ++i) {
QDomNode m = prods.at(i);
QString prodId = m.toElement().attribute("id");
if (prodId.startsWith("slowmotion")) {
missingXml = m.toElement();
break;
}
- }
+ }
}
}
if (missingXml == QDomElement()) return NULL;
projects / kdenlive / blobdiff