Commit e15a56ab authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Cleanup

parent fbeb5572
......@@ -1322,7 +1322,13 @@ std::unique_ptr<Mlt::Producer> ProjectClip::getClone()
QPoint ProjectClip::zone() const
{
return ClipController::zone();
int in = getProducerIntProperty(QStringLiteral("kdenlive:zone_in"));
int max = getFramePlaytime() - 1;
int out = qMin(getProducerIntProperty(QStringLiteral("kdenlive:zone_out")), max);
if (out <= in) {
out = max;
}
return QPoint(in, out);
}
const QString ProjectClip::hash(bool createIfEmpty)
......
......@@ -828,18 +828,6 @@ void ClipController::setZone(const QPoint &zone)
setProducerProperty(QStringLiteral("kdenlive:zone_out"), zone.y());
}
QPoint ClipController::zone() const
{
int in = getProducerIntProperty(QStringLiteral("kdenlive:zone_in"));
int max = getFramePlaytime() - 1;
int out = qMin(getProducerIntProperty(QStringLiteral("kdenlive:zone_out")), max);
if (out <= in) {
out = max;
}
QPoint zone(in, out);
return zone;
}
const QString ClipController::getClipHash() const
{
return getProducerProperty(QStringLiteral("kdenlive:file_hash"));
......
......@@ -161,7 +161,6 @@ public:
std::shared_ptr<MarkerSortModel> getFilteredMarkerModel() const;
void setZone(const QPoint &zone);
QPoint zone() const;
bool hasLimitedDuration() const;
void forceLimitedDuration();
Mlt::Properties &properties();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment