Fix up a busted preprocessor check [PATCH by Ray Lehtiniemi]

[kdenlive] / src / abstractclipitem.cpp

diff --git a/src/abstractclipitem.cpp b/src/abstractclipitem.cpp
index 9a7ed808d053614109f6bcc051222fbec2387585..e889ba5367c169862333edcab62155ba0249463a 100644 (file)
--- a/src/abstractclipitem.cpp
+++ b/src/abstractclipitem.cpp
@@ -18,17 +18,15 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <QGraphicsScene>
-#include <QGraphicsView>
-#include <QScrollBar>
-#include <QToolTip>
+#include "abstractclipitem.h"
+#include "customtrackscene.h"
+#include "kdenlivesettings.h"
 
 #include <KDebug>
 #include <KLocale>
 
-#include "abstractclipitem.h"
-#include "customtrackscene.h"
-#include "kdenlivesettings.h"
+#include <QPainter>
+#include <QToolTip>
 
 AbstractClipItem::AbstractClipItem(const ItemInfo info, const QRectF& rect, double fps): QGraphicsRectItem(rect), m_track(0), m_fps(fps), m_editedKeyframe(-1), m_selectedKeyframe(0), m_keyframeFactor(1) {
     setFlags(/*QGraphicsItem::ItemClipsToShape | */QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
@@ -125,7 +123,7 @@ void AbstractClipItem::resizeStart(int posx, double speed) {
         }*/
 }
 
-void AbstractClipItem::resizeEnd(int posx, double speed, bool updateKeyFrames) {
+void AbstractClipItem::resizeEnd(int posx, double speed, bool /*updateKeyFrames*/) {
     GenTime durationDiff = GenTime(posx, m_fps) - endPos();
     if (durationDiff == GenTime()) return;
     //kDebug() << "// DUR DIFF1:" << durationDiff.frames(25) << ", ADJUSTED: " << durationDiff.frames(25) * speed << ", SPED:" << speed;
@@ -147,8 +145,8 @@ void AbstractClipItem::resizeEnd(int posx, double speed, bool updateKeyFrames) {
                 kDebug() << "/////////  CURRENT: " << startPos().frames(25) << "x" << endPos().frames(25) << ", RECT: " << rect() << "-" << pos();
                 kDebug() << "/////////  COLLISION: " << ((AbstractClipItem *)item)->startPos().frames(25) << "x" << ((AbstractClipItem *)item)->endPos().frames(25) << ", RECT: " << ((AbstractClipItem *)item)->rect() << "-" << item->pos();*/
                 GenTime diff = ((AbstractClipItem *)item)->startPos() - GenTime(1, m_fps) - startPos();
-                m_cropDuration = diff;
-                setRect(0, 0, m_cropDuration.frames(m_fps) - 0.02, rect().height());
+                m_cropDuration = diff * speed;
+                setRect(0, 0, cropDuration().frames(m_fps) - 0.02, rect().height());
                 break;
             }
         }
@@ -193,7 +191,6 @@ QPainterPath AbstractClipItem::upperRectPart(QRectF br) {
     int br_startx = (int)(br.x() + offset);
     int br_starty = (int)(br.y());
     int br_halfy = (int)(br.y() + br.height() / 2 - offset);
-    int br_endy = (int)(br.y() + br.height());
 
     roundRectPathUpper.moveTo(br_endx  , br_halfy);
     roundRectPathUpper.arcTo(br_endx - roundingX , br_starty , roundingX, roundingY, 0.0, 90.0);
@@ -212,7 +209,6 @@ QPainterPath AbstractClipItem::lowerRectPart(QRectF br) {
 
     int br_endx = (int)(br.x() + br .width() - offset);
     int br_startx = (int)(br.x() + offset);
-    int br_starty = (int)(br.y());
     int br_halfy = (int)(br.y() + br.height() / 2 - offset);
     int br_endy = (int)(br.y() + br.height() - 1);
 
@@ -228,7 +224,7 @@ QPainterPath AbstractClipItem::lowerRectPart(QRectF br) {
     return roundRectPathLower;
 }
 
-void AbstractClipItem::drawKeyFrames(QPainter *painter, QRectF exposedRect) {
+void AbstractClipItem::drawKeyFrames(QPainter *painter, QRectF /*exposedRect*/) {
     if (m_keyframes.count() < 2) return;
     QRectF br = rect();
     double maxw = br.width() / m_cropDuration.frames(m_fps);
@@ -290,7 +286,7 @@ int AbstractClipItem::mouseOverKeyFrames(QPointF pos) {
             x1 = br.x() + maxw * (i.key() - m_cropStart.frames(m_fps));
             y1 = br.bottom() - i.value() * maxh;
             if (qAbs(pos.x() - x1) < 6 && qAbs(pos.y() - y1) < 6) {
-                setToolTip("[" + QString::number((GenTime(i.key(), m_fps) - m_cropStart).seconds(), 'f', 2) + i18n("seconds") + ", " + QString::number(i.value(), 'f', 1) + "%]");
+                setToolTip('[' + QString::number((GenTime(i.key(), m_fps) - m_cropStart).seconds(), 'f', 2) + i18n("seconds") + ", " + QString::number(i.value(), 'f', 1) + "%]");
                 return i.key();
             } else if (x1 > pos.x()) break;
             ++i;
@@ -367,7 +363,7 @@ bool AbstractClipItem::hasKeyFrames() const {
     return !m_keyframes.isEmpty();
 }
 
-QRect AbstractClipItem::visibleRect() {
+/*QRect AbstractClipItem::visibleRect() {
     QRect rectInView;
     if (scene()->views().size() > 0) {
         rectInView = scene()->views()[0]->viewport()->rect();
@@ -376,9 +372,22 @@ QRect AbstractClipItem::visibleRect() {
         //kDebug() << scene()->views()[0]->viewport()->rect() << " " <<  scene()->views()[0]->horizontalScrollBar()->value();
     }
     return rectInView;
-}
+}*/
 
 CustomTrackScene* AbstractClipItem::projectScene() {
     if (scene()) return static_cast <CustomTrackScene*>(scene());
     return NULL;
 }
+
+void AbstractClipItem::setItemLocked(bool locked) {
+    if (locked) {
+        setSelected(false);
+        setFlag(QGraphicsItem::ItemIsMovable, false);
+        setFlag(QGraphicsItem::ItemIsSelectable, false);
+    } else setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
+}
+
+bool AbstractClipItem::isItemLocked() const {
+    return !(flags() & (QGraphicsItem::ItemIsSelectable));
+}
+