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

[kdenlive] / src / customtrackview.h

diff --git a/src/customtrackview.h b/src/customtrackview.h
index 5129b56370de641ac4ea4e4ac197fb44566a7eca..f708867169fb1409dff5c522ddc269eeb410d9b4 100644 (file)
--- a/src/customtrackview.h
+++ b/src/customtrackview.h
@@ -107,6 +107,8 @@ public:
     void saveThumbnails();
     void autoTransition();
     QStringList getLadspaParams(QDomElement effect) const;
+    void initCursorPos(int pos);
+    void lockTrack(int ix, bool lock);
 
 public slots:
     void setCursorPos(int pos, bool seek = true);
@@ -121,9 +123,9 @@ public slots:
     void slotAddTransition(ClipItem* clip, ItemInfo transitionInfo, int endTrack, QDomElement transition = QDomElement());
     void slotAddTransitionToSelectedClips(QDomElement transition);
     void slotTransitionUpdated(Transition *, QDomElement);
-    void slotTransitionTrackUpdated(Transition *tr, int track);
     void slotSwitchTrackAudio(int ix);
     void slotSwitchTrackVideo(int ix);
+    void slotSwitchTrackLock(int ix);
     void slotUpdateClip(const QString &clipId);
     void slotAddClipMarker(const QString &id, GenTime t, QString c);
     bool addGuide(const GenTime pos, const QString &comment);
@@ -141,6 +143,7 @@ public slots:
     void slotInsertTrack(int ix);
     void slotDeleteTrack(int ix);
     void slotChangeTrack(int ix);
+    void clipNameChanged(const QString id, const QString name);
 
 protected:
     virtual void drawBackground(QPainter * painter, const QRectF & rect);
@@ -178,12 +181,11 @@ private:
     QPoint m_clickEvent;
     QList <CommentedTime> m_searchPoints;
     QList <Guide *> m_guides;
-    void updateSnapPoints(AbstractClipItem *selected);
+    void updateSnapPoints(AbstractClipItem *selected, QList <GenTime> offsetList = QList <GenTime> (), bool skipSelectedItems = false);
     ClipItem *getClipItemAt(int pos, int track);
     ClipItem *getClipItemAt(GenTime pos, int track);
     ClipItem *getClipItemAtEnd(GenTime pos, int track);
     ClipItem *getClipItemAtStart(GenTime pos, int track);
-    Transition *getTransitionItemAt(int pos, int track);
     Transition *getTransitionItemAt(GenTime pos, int track);
     Transition *getTransitionItemAtEnd(GenTime pos, int track);
     Transition *getTransitionItemAtStart(GenTime pos, int track);
@@ -195,6 +197,8 @@ private:
     QMenu *m_timelineContextClipMenu;
     QMenu *m_timelineContextTransitionMenu;
     QAction *m_autoTransition;
+    QAction *m_changeSpeedAction;
+    QAction *m_pasteEffectsAction;
     QTimer m_scrollTimer;
     int m_scrollOffset;
 
@@ -220,7 +224,12 @@ private:
     ClipItem *getMainActiveClip() const;
     bool insertPossible(AbstractGroupItem *group, const QPoint &pos) const;
     void resetSelectionGroup(bool selectItems = true);
-    void groupSelectedItems();
+    void groupSelectedItems(bool force = false);
+    /** Get available space for clip move (min and max free positions) */
+    void getClipAvailableSpace(AbstractClipItem *item, GenTime &minimum, GenTime &maximum);
+    /** Get available space for transition move (min and max free positions) */
+    void getTransitionAvailableSpace(AbstractClipItem *item, GenTime &minimum, GenTime &maximum);
+
 
 private slots:
     void slotRefreshGuides();
@@ -238,6 +247,7 @@ signals:
     void trackHeightChanged();
     void displayMessage(const QString, MessageType);
     void showClipFrame(DocClipBase *, const int);
+    void doTrackLock(int, bool);
 };
 
 #endif