#endif
Transition::Transition(const ItemInfo &info, int transitiontrack, double fps, const QDomElement ¶ms, bool automaticTransition) :
#endif
Transition::Transition(const ItemInfo &info, int transitiontrack, double fps, const QDomElement ¶ms, bool automaticTransition) :
- AbstractClipItem(info, QRectF(), fps),
- m_forceTransitionTrack(false),
- m_automaticTransition(automaticTransition),
- m_transitionTrack(transitiontrack)
+ AbstractClipItem(info, QRectF(), fps),
+ m_forceTransitionTrack(false),
+ m_automaticTransition(automaticTransition),
+ m_transitionTrack(transitiontrack)
Transition *tr = new Transition(info(), transitionEndTrack(), m_fps, xml);
return tr;
}
Transition *tr = new Transition(info(), transitionEndTrack(), m_fps, xml);
return tr;
}
- m_parameters = params;
- if (m_parameters.attribute("force_track") == "1") setForcedTrack(true, m_parameters.attribute("transition_btrack").toInt());
- else if (m_parameters.attribute("force_track") == "0") setForcedTrack(false, m_parameters.attribute("transition_btrack").toInt());
- m_name = i18n(m_parameters.firstChildElement("name").text().toUtf8().data());
- update();
+ if (m_parameters != params) {
+ m_parameters = params;
+ if (m_parameters.attribute("force_track") == "1") setForcedTrack(true, m_parameters.attribute("transition_btrack").toInt());
+ else if (m_parameters.attribute("force_track") == "0") setForcedTrack(false, m_parameters.attribute("transition_btrack").toInt());
+ m_name = i18n(m_parameters.firstChildElement("name").text().toUtf8().data());
+ update();
+ }
// Draw clip name
if (isSelected() || (parentItem() && parentItem()->isSelected())) {
framePen.setColor(scene()->palette().highlight().color());
// Draw clip name
if (isSelected() || (parentItem() && parentItem()->isSelected())) {
framePen.setColor(scene()->palette().highlight().color());
int newTrack = newPos.y() / KdenliveSettings::trackheight();
newTrack = qMin(newTrack, projectScene()->tracksCount() - 1);
newTrack = qMax(newTrack, 0);
int newTrack = newPos.y() / KdenliveSettings::trackheight();
newTrack = qMin(newTrack, projectScene()->tracksCount() - 1);
newTrack = qMax(newTrack, 0);
- QStringList lockedTracks = property("locked_tracks").toStringList();
- if (lockedTracks.contains(QString::number(newTrack))) {
- // Trying to move to a locked track
- return pos();
- }
+ QStringList lockedTracks = property("locked_tracks").toStringList();
+ if (lockedTracks.contains(QString::number(newTrack))) {
+ // Trying to move to a locked track
+ return pos();
+ }
newPos.setY((int)(newTrack * KdenliveSettings::trackheight() + itemOffset() + 1));
// Only one clip is moving
QRectF sceneShape = rect();
newPos.setY((int)(newTrack * KdenliveSettings::trackheight() + itemOffset() + 1));
// Only one clip is moving
QRectF sceneShape = rect();
m_info.track = newTrack;
m_info.startPos = GenTime((int) newPos.x(), m_fps);
//kDebug()<<"// ITEM NEW POS: "<<newPos.x()<<", mapped: "<<mapToScene(newPos.x(), 0).x();
m_info.track = newTrack;
m_info.startPos = GenTime((int) newPos.x(), m_fps);
//kDebug()<<"// ITEM NEW POS: "<<newPos.x()<<", mapped: "<<mapToScene(newPos.x(), 0).x();
const double scale = projectScene()->scale().x();
double maximumOffset = 6 / scale;
QRectF rect = sceneBoundingRect();
const double scale = projectScene()->scale().x();
double maximumOffset = 6 / scale;
QRectF rect = sceneBoundingRect();
- if (qAbs((int)(pos.x() - rect.x())) < maximumOffset) return RESIZESTART;
- else if (qAbs((int)(pos.x() - (rect.right()))) < maximumOffset) return RESIZEEND;
- return MOVE;
+ if (qAbs((int)(pos.x() - rect.x())) < maximumOffset) return ResizeStart;
+ else if (qAbs((int)(pos.x() - (rect.right()))) < maximumOffset) return ResizeEnd;
+ return MoveOperation;
- // Transition was expanded, check if we had a keyframe at end position
- foreach(QString pos, values) {
- if (!pos.contains('=')) {
- ++i;
- continue;
- }
- frame = pos.section('=', 0, 0).toInt();
- if (frame == oldEnd) {
- // Move that keyframe to new end
+ // Transition was expanded, check if we had a keyframe at end position
+ foreach(QString pos, values) {
+ if (!pos.contains('=')) {
+ ++i;
+ continue;
+ }
+ frame = pos.section('=', 0, 0).toInt();
+ if (frame == oldEnd) {
+ // Move that keyframe to new end
- // Transition was shortened, check for out of bounds keyframes
- foreach(const QString &pos, values) {
- if (!pos.contains('=')) {
- ++i;
- continue;
- }
- frame = pos.section('=', 0, 0).toInt();
- if (frame > duration) {
- modified = true;
- break;
- }
- ++i;
- }
+ // Transition was shortened, check for out of bounds keyframes
+ foreach(const QString &pos, values) {
+ if (!pos.contains('=')) {
+ ++i;
+ continue;
+ }
+ frame = pos.section('=', 0, 0).toInt();
+ if (frame > duration) {
+ modified = true;
+ break;
+ }
+ ++i;
+ }