//setAcceptsHoverEvents(true);
connect(this , SIGNAL(prepareAudioThumb(double,int,int,int,int)) , this, SLOT(slotPrepareAudioThumb(double,int,int,int,int)));
- if (m_clipType == VIDEO || m_clipType == AV || m_clipType == SLIDESHOW || m_clipType == PLAYLIST) {
+ if (m_clipType == Video || m_clipType == AV || m_clipType == SlideShow || m_clipType == Playlist) {
m_baseColor = QColor(141, 166, 215);
if (!m_clip->isPlaceHolder()) {
m_hasThumbs = true;
if (generateThumbs) QTimer::singleShot(200, this, SLOT(slotFetchThumbs()));
}
- } else if (m_clipType == COLOR) {
+ } else if (m_clipType == Color) {
QString colour = m_clip->getProperty("colour");
colour = colour.replace(0, 2, "#");
m_baseColor = QColor(colour.left(7));
- } else if (m_clipType == IMAGE || m_clipType == TEXT) {
+ } else if (m_clipType == Image || m_clipType == Text) {
m_baseColor = QColor(141, 166, 215);
- if (m_clipType == TEXT) {
+ if (m_clipType == Text) {
connect(m_clip->thumbProducer(), SIGNAL(thumbReady(int,QImage)), this, SLOT(slotThumbReady(int,QImage)));
}
//m_startPix = KThumb::getImage(KUrl(clip->getProperty("resource")), (int)(KdenliveSettings::trackheight() * KdenliveSettings::project_display_ratio()), KdenliveSettings::trackheight());
- } else if (m_clipType == AUDIO) {
+ } else if (m_clipType == Audio) {
m_baseColor = QColor(141, 215, 166);
connect(m_clip, SIGNAL(gotAudioData()), this, SLOT(slotGotAudioData()));
}
m_startThumbTimer.stop();
if (scene())
scene()->removeItem(this);
- if (m_clipType == VIDEO || m_clipType == AV || m_clipType == SLIDESHOW || m_clipType == PLAYLIST) {
+ if (m_clipType == Video || m_clipType == AV || m_clipType == SlideShow || m_clipType == Playlist) {
//disconnect(m_clip->thumbProducer(), SIGNAL(thumbReady(int,QImage)), this, SLOT(slotThumbReady(int,QImage)));
//disconnect(m_clip, SIGNAL(gotAudioData()), this, SLOT(slotGotAudioData()));
}
ClipItem *ClipItem::clone(const ItemInfo &info) const
{
ClipItem *duplicate = new ClipItem(m_clip, info, m_fps, m_speed, m_strobe, FRAME_SIZE);
- if (m_clipType == IMAGE || m_clipType == TEXT) duplicate->slotSetStartThumb(m_startPix);
- else if (m_clipType != COLOR) {
+ if (m_clipType == Image || m_clipType == Text) duplicate->slotSetStartThumb(m_startPix);
+ else if (m_clipType != Color) {
if (info.cropStart == m_info.cropStart) duplicate->slotSetStartThumb(m_startPix);
if (info.cropStart + (info.endPos - info.startPos) == m_info.cropStart + m_info.cropDuration) {
duplicate->slotSetEndThumb(m_endPix);
if (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe") {
if (e.attribute("keyframes").isEmpty()) {
// Effect has a keyframe type parameter, we need to set the values
- e.setAttribute("keyframes", QString::number((int) cropStart().frames(m_fps)) + ':' + e.attribute("default"));
+ e.setAttribute("keyframes", QString::number((int) cropStart().frames(m_fps)) + '=' + e.attribute("default"));
}
else if (offset != 0) {
// adjust keyframes to this clip
{
QStringList result;
// Simple keyframes
- const QStringList list = keyframes.split(';', QString::SkipEmptyParts);
+ const QStringList list = keyframes.split(QLatin1Char(';'), QString::SkipEmptyParts);
foreach(const QString &keyframe, list) {
- int pos = keyframe.section(':', 0, 0).toInt() - offset;
- QString newKey = QString::number(pos) + ":" + keyframe.section(':', 1);
+ const int pos = keyframe.section('=', 0, 0).toInt() - offset;
+ const QString newKey = QString::number(pos) + "=" + keyframe.section('=', 1);
result.append(newKey);
}
return result.join(";");
// go through all keyframes for one param
foreach(const QString &str, keyframes) {
- int pos = str.section(':', 0, 0).toInt();
- double val = locale.toDouble(str.section(':', 1, 1));
+ int pos = str.section('=', 0, 0).toInt();
+ double val = locale.toDouble(str.section('=', 1, 1));
if (pos - start < 0) {
// a keyframe is defined before the start of the clip
cutKeyFrame = true;
int diff = pos - lastPos;
double ratio = (double)(start - lastPos) / diff;
int newValue = lastValue + (val - lastValue) * ratio;
- newKeyFrames.append(QString::number(start) + ':' + QString::number(newValue));
+ newKeyFrames.append(QString::number(start) + '=' + QString::number(newValue));
modified = true;
}
cutKeyFrame = false;
if (diff != 0) {
double ratio = (double)(end - lastPos) / diff;
int newValue = lastValue + (val - lastValue) * ratio;
- newKeyFrames.append(QString::number(end) + ':' + QString::number(newValue));
+ newKeyFrames.append(QString::number(end) + '=' + QString::number(newValue));
modified = true;
}
break;
} else {
- newKeyFrames.append(QString::number(pos) + ':' + QString::number(val));
+ newKeyFrames.append(QString::number(pos) + '=' + QString::number(val));
}
}
lastPos = pos;
// parse keyframes
const QStringList keyframes = e.attribute("keyframes").split(';', QString::SkipEmptyParts);
foreach(const QString &str, keyframes) {
- int pos = str.section(':', 0, 0).toInt();
- double val = locale.toDouble(str.section(':', 1, 1));
+ int pos = str.section('=', 0, 0).toInt();
+ double val = locale.toDouble(str.section('=', 1, 1));
m_keyframes[pos] = val;
}
if (m_keyframes.find(m_editedKeyframe) == m_keyframes.end()) m_editedKeyframe = -1;
// parse keyframes
const QStringList keyframes = e.attribute("keyframes").split(';', QString::SkipEmptyParts);
foreach(const QString &str, keyframes) {
- int pos = str.section(':', 0, 0).toInt();
- double val = locale.toDouble(str.section(':', 1, 1));
+ int pos = str.section('=', 0, 0).toInt();
+ double val = locale.toDouble(str.section('=', 1, 1));
m_keyframes[pos] = val;
}
if (m_keyframes.find(m_editedKeyframe) == m_keyframes.end())
if (m_keyframes.count() > 0) {
QMap<int, int>::const_iterator i = m_keyframes.constBegin();
while (i != m_keyframes.constEnd()) {
- keyframes.append(QString::number(i.key()) + ':' + QString::number(i.value()) + ';');
+ keyframes.append(QString::number(i.key()) + '=' + QString::number(i.value()) + ';');
++i;
}
}
QDomElement ClipItem::selectedEffect()
{
- if (m_selectedEffect == -1 || m_effectList.isEmpty()) return QDomElement();
+ if (m_selectedEffect == -1 || m_effectList.isEmpty())
+ return QDomElement();
return effectAtIndex(m_selectedEffect);
}
{
if (checkDuration && (m_maxDuration != m_clip->maxDuration())) {
m_maxDuration = m_clip->maxDuration();
- if (m_clipType != IMAGE && m_clipType != TEXT && m_clipType != COLOR) {
+ if (m_clipType != Image && m_clipType != Text && m_clipType != Color) {
if (m_maxDuration != GenTime() && m_info.cropStart + m_info.cropDuration > m_maxDuration) {
// Clip duration changed, make sure to stay in correct range
if (m_info.cropStart > m_maxDuration) {
}
}
}
- if (m_clipType == COLOR) {
+ if (m_clipType == Color) {
QString colour = m_clip->getProperty("colour");
colour = colour.replace(0, 2, "#");
m_baseColor = QColor(colour.left(7));
void ClipItem::slotFetchThumbs()
{
- if (scene() == NULL || m_clipType == AUDIO || m_clipType == COLOR) return;
- if (m_clipType == IMAGE) {
+ if (scene() == NULL || m_clipType == Audio || m_clipType == Color) return;
+ if (m_clipType == Image) {
if (m_startPix.isNull()) {
m_startPix = KThumb::getImage(KUrl(m_clip->getProperty("resource")), (int)(KdenliveSettings::trackheight() * KdenliveSettings::project_display_ratio()), KdenliveSettings::trackheight());
update();
return;
}
- if (m_clipType == TEXT) {
+ if (m_clipType == Text) {
if (m_startPix.isNull()) slotGetStartThumb();
return;
}
m_startPix = pix;
m_startThumbRequested = false;
update(r.left(), r.top(), width, pix.height());
- if (m_clipType == IMAGE || m_clipType == TEXT) {
+ if (m_clipType == Image || m_clipType == Text) {
update(r.right() - width, r.top(), width, pix.height());
}
} else if (m_endThumbRequested && frame == (m_speedIndependantInfo.cropStart + m_speedIndependantInfo.cropDuration).frames(m_fps) - 1) {
int ClipItem::type() const
{
- return AVWIDGET;
+ return AVWidget;
}
DocClipBase *ClipItem::baseClip() const
// draw thumbnails
if (KdenliveSettings::videothumbnails() && !isAudioOnly()) {
QRectF thumbRect;
- if ((m_clipType == IMAGE || m_clipType == TEXT) && !m_startPix.isNull()) {
+ if ((m_clipType == Image || m_clipType == Text) && !m_startPix.isNull()) {
if (thumbRect.isNull()) thumbRect = QRectF(0, 0, mapped.height() / m_startPix.height() * m_startPix.width(), mapped.height());
thumbRect.moveTopRight(mapped.topRight());
painter->drawPixmap(thumbRect, m_startPix, m_startPix.rect());
}
// if we are in full zoom, paint thumbnail for every frame
- if (m_clip->thumbProducer() && clipType() != COLOR && clipType() != AUDIO && !m_audioOnly && transformation.m11() == FRAME_SIZE) {
+ if (m_clip->thumbProducer() && clipType() != Color && clipType() != Audio && !m_audioOnly && transformation.m11() == FRAME_SIZE) {
int offset = (m_info.startPos - m_info.cropStart).frames(m_fps);
int left = qMax((int) m_info.cropStart.frames(m_fps) + 1, (int) mapToScene(exposed.left(), 0).x() - offset);
int right = qMin((int)(m_info.cropStart + m_info.cropDuration).frames(m_fps) - 1, (int) mapToScene(exposed.right(), 0).x() - offset);
QPointF startPos = mapped.topLeft();
int startOffset = m_info.cropStart.frames(m_fps);
- if (clipType() == IMAGE || clipType() == TEXT) {
+ if (clipType() == Image || clipType() == Text) {
for (int i = left; i <= right; ++i) {
painter->drawPixmap(startPos + QPointF(FRAME_SIZE *(i - startOffset), 0), m_startPix);
}
}
}
// draw audio thumbnails
- if (KdenliveSettings::audiothumbnails() && m_speed == 1.0 && !isVideoOnly() && ((m_clipType == AV && (exposed.bottom() > (rect().height() / 2) || isAudioOnly())) || m_clipType == AUDIO) && m_audioThumbReady) {
+ if (KdenliveSettings::audiothumbnails() && m_speed == 1.0 && !isVideoOnly() && ((m_clipType == AV && (exposed.bottom() > (rect().height() / 2) || isAudioOnly())) || m_clipType == Audio) && m_audioThumbReady) {
double startpixel = exposed.left();
if (startpixel < 0)
}
-OPERATIONTYPE ClipItem::operationMode(const QPointF &pos)
+OperationType ClipItem::operationMode(const QPointF &pos)
{
- if (isItemLocked()) return NONE;
+ if (isItemLocked()) return None;
const double scale = projectScene()->scale().x();
double maximumOffset = 6 / scale;
if (isSelected() || (parentItem() && parentItem()->isSelected())) {
int kf = mouseOverKeyFrames(pos, maximumOffset);
if (kf != -1) {
m_editedKeyframe = kf;
- return KEYFRAME;
+ return KeyFrame;
}
}
QRectF rect = sceneBoundingRect();
int addtransitionOffset = 10;
// Don't allow add transition if track height is very small. No transitions for audio only clips
- if (rect.height() < 30 || isAudioOnly() || m_clipType == AUDIO) addtransitionOffset = 0;
+ if (rect.height() < 30 || isAudioOnly() || m_clipType == Audio) addtransitionOffset = 0;
if (qAbs((int)(pos.x() - (rect.x() + m_startFade))) < maximumOffset && qAbs((int)(pos.y() - rect.y())) < 6) {
- return FADEIN;
+ return FadeIn;
} else if ((pos.x() <= rect.x() + rect.width() / 2) && pos.x() - rect.x() < maximumOffset && (rect.bottom() - pos.y() > addtransitionOffset)) {
// If we are in a group, allow resize only if all clips start at same position
if (parentItem()) {
QGraphicsItemGroup *dragGroup = static_cast <QGraphicsItemGroup *>(parentItem());
QList<QGraphicsItem *> list = dragGroup->childItems();
for (int i = 0; i < list.count(); ++i) {
- if (list.at(i)->type() == AVWIDGET) {
+ if (list.at(i)->type() == AVWidget) {
ClipItem *c = static_cast <ClipItem*>(list.at(i));
- if (c->startPos() != startPos()) return MOVE;
+ if (c->startPos() != startPos()) return MoveOperation;
}
}
}
- return RESIZESTART;
+ return ResizeStart;
} else if (qAbs((int)(pos.x() - (rect.x() + rect.width() - m_endFade))) < maximumOffset && qAbs((int)(pos.y() - rect.y())) < 6) {
- return FADEOUT;
+ return FadeOut;
} else if ((pos.x() >= rect.x() + rect.width() / 2) && (rect.right() - pos.x() < maximumOffset) && (rect.bottom() - pos.y() > addtransitionOffset)) {
// If we are in a group, allow resize only if all clips end at same position
if (parentItem()) {
QGraphicsItemGroup *dragGroup = static_cast <QGraphicsItemGroup *>(parentItem());
QList<QGraphicsItem *> list = dragGroup->childItems();
for (int i = 0; i < list.count(); ++i) {
- if (list.at(i)->type() == AVWIDGET) {
+ if (list.at(i)->type() == AVWidget) {
ClipItem *c = static_cast <ClipItem*>(list.at(i));
- if (c->endPos() != endPos()) return MOVE;
+ if (c->endPos() != endPos()) return MoveOperation;
}
}
}
- return RESIZEEND;
+ return ResizeEnd;
} else if ((pos.x() - rect.x() < 16 / scale) && (rect.bottom() - pos.y() <= addtransitionOffset)) {
- return TRANSITIONSTART;
+ return TransitionStart;
} else if ((rect.right() - pos.x() < 16 / scale) && (rect.bottom() - pos.y() <= addtransitionOffset)) {
- return TRANSITIONEND;
+ return TransitionEnd;
}
- return MOVE;
+ return MoveOperation;
}
int ClipItem::itemHeight()
void ClipItem::resizeStart(int posx, bool /*size*/, bool emitChange)
{
bool sizeLimit = false;
- if (clipType() != IMAGE && clipType() != COLOR && clipType() != TEXT) {
+ if (clipType() != Image && clipType() != Color && clipType() != Text) {
const int min = (startPos() - cropStart()).frames(m_fps);
if (posx < min) posx = min;
sizeLimit = true;
QRectF sceneShape = rect();
sceneShape.translate(newPos);
QList<QGraphicsItem*> items;
- if (projectScene()->editMode() == NORMALEDIT)
+ if (projectScene()->editMode() == NormalEdit)
items = scene()->items(sceneShape, Qt::IntersectsItemShape);
items.removeAll(this);
bool forwardMove = newPos.x() > pos().x();
double offset = e.attribute("offset", "0").toDouble();
if (factor != 1 || offset != 0) {
for (int j = 0; j < values.count(); j++) {
- QString pos = values.at(j).section(':', 0, 0);
- double val = (locale.toDouble(values.at(j).section(':', 1, 1)) - offset) / factor;
+ QString pos = values.at(j).section('=', 0, 0);
+ double val = (locale.toDouble(values.at(j).section('=', 1, 1)) - offset) / factor;
values[j] = pos + '=' + locale.toString(val);
}
}
m_audioOnly = force;
if (m_audioOnly) m_baseColor = QColor(141, 215, 166);
else {
- if (m_clipType == COLOR) {
+ if (m_clipType == Color) {
QString colour = m_clip->getProperty("colour");
colour = colour.replace(0, 2, "#");
m_baseColor = QColor(colour.left(7));
- } else if (m_clipType == AUDIO) m_baseColor = QColor(141, 215, 166);
+ } else if (m_clipType == Audio) m_baseColor = QColor(141, 215, 166);
else m_baseColor = QColor(141, 166, 215);
}
if (parentItem())
QStringList newkfr;
bool added = false;
foreach(const QString &str, keyframes) {
- int kpos = str.section(':', 0, 0).toInt();
- double newval = locale.toDouble(str.section(':', 1, 1));
+ int kpos = str.section('=', 0, 0).toInt();
+ double newval = locale.toDouble(str.section('=', 1, 1));
if (kpos < pos) {
newkfr.append(str);
} else if (!added) {
if (i == m_visibleParam)
- newkfr.append(QString::number(pos) + ':' + QString::number(val));
+ newkfr.append(QString::number(pos) + '=' + QString::number(val));
else
- newkfr.append(QString::number(pos) + ':' + locale.toString(newval));
+ newkfr.append(QString::number(pos) + '=' + locale.toString(newval));
if (kpos > pos) newkfr.append(str);
added = true;
} else newkfr.append(str);
}
if (!added) {
if (i == m_visibleParam)
- newkfr.append(QString::number(pos) + ':' + QString::number(val));
+ newkfr.append(QString::number(pos) + '=' + QString::number(val));
else
- newkfr.append(QString::number(pos) + ':' + e.attribute("default"));
+ newkfr.append(QString::number(pos) + '=' + e.attribute("default"));
}
e.setAttribute("keyframes", newkfr.join(";"));
}
const QStringList keyframes = kfr.split(';', QString::SkipEmptyParts);
QStringList newkfr;
foreach(const QString &str, keyframes) {
- if (str.section(':', 0, 0).toInt() != oldpos) {
+ if (str.section('=', 0, 0).toInt() != oldpos) {
newkfr.append(str);
} else if (newpos != -1) {
newpos = qMax(newpos, start);
newpos = qMin(newpos, end);
if (i == m_visibleParam)
- newkfr.append(QString::number(newpos) + ':' + locale.toString(value));
+ newkfr.append(QString::number(newpos) + '=' + locale.toString(value));
else
- newkfr.append(QString::number(newpos) + ':' + str.section(':', 1, 1));
+ newkfr.append(QString::number(newpos) + '=' + str.section('=', 1, 1));
}
}
e.setAttribute("keyframes", newkfr.join(";"));
m_limitedKeyFrames = e.attribute("type") == "keyframe";
const QStringList keyframes = e.attribute("keyframes").split(';', QString::SkipEmptyParts);
foreach(const QString &str, keyframes) {
- int pos = str.section(':', 0, 0).toInt();
- double val = locale.toDouble(str.section(':', 1, 1));
+ int pos = str.section('=', 0, 0).toInt();
+ double val = locale.toDouble(str.section('=', 1, 1));
m_keyframes[pos] = val;
}
if (!m_keyframes.contains(m_selectedKeyframe)) m_selectedKeyframe = -1;
const QStringList data = parameter.attribute("keyframes").split(';', QString::SkipEmptyParts);
QMap <int, double> keyframes;
foreach (QString keyframe, data) {
- int keyframepos = keyframe.section(':', 0, 0).toInt();
+ int keyframepos = keyframe.section('=', 0, 0).toInt();
// if keyframe was at clip start, update it
if (keyframepos == oldin) {
keyframepos = in;
keyFrameUpdated = true;
}
- keyframes[keyframepos] = locale.toDouble(keyframe.section(':', 1, 1));
+ keyframes[keyframepos] = locale.toDouble(keyframe.section('=', 1, 1));
}
QString newkfr;
QMap<int, double>::const_iterator k = keyframes.constBegin();
while (k != keyframes.constEnd()) {
- newkfr.append(QString::number(k.key()) + ':' + QString::number(qRound(k.value())) + ';');
+ newkfr.append(QString::number(k.key()) + '=' + QString::number(qRound(k.value())) + ';');
++k;
}
parameter.setAttribute("keyframes", newkfr);
projects / kdenlive / blobdiff