Wheel on project timeline ruler to seek, ctrl+wheel seeks 1 second instead of 1 frame

[kdenlive] / src / customtrackview.h

diff --git a/src/customtrackview.h b/src/customtrackview.h
index faa5f753860fd2ad1468fc36089e95cb653e3c3c..1c9d46f29bc10a169100eabed81b7bd0d73c64b3 100644 (file)
--- a/src/customtrackview.h
+++ b/src/customtrackview.h
@@ -29,9 +29,10 @@
 #include <KUndoStack>
 
 #include "kdenlivedoc.h"
-#include "clipitem.h"
-
 
+class ClipItem;
+class AbstractClipItem;
+class Transition;
 
 class CustomTrackView : public QGraphicsView {
     Q_OBJECT
@@ -41,38 +42,49 @@ public:
     virtual void mousePressEvent(QMouseEvent * event);
     virtual void mouseReleaseEvent(QMouseEvent * event);
     virtual void mouseMoveEvent(QMouseEvent * event);
-    void addTrack(TRACKTYPE type);
+    void addTrack(TrackInfo type);
     void removeTrack();
     int cursorPos();
     void checkAutoScroll();
-    void moveClip(const QPointF &startPos, const QPointF &endPos);
-    void resizeClip(const QPointF &startPos, const QPointF &endPos, bool resizeClipStart);
-    void addClip(QDomElement xml, int clipId, int track, GenTime startpos, const QRectF &rect, GenTime duration);
-    void deleteClip(int track, GenTime startpos, const QRectF &rect);
+    void moveClip(const ItemInfo start, const ItemInfo end);
+    /** move transition, startPos = (old start, old end), endPos = (new start, new end) */
+    void moveTransition(const ItemInfo start, const ItemInfo end);
+    void resizeClip(const ItemInfo start, const ItemInfo end);
+    void addClip(QDomElement xml, int clipId, ItemInfo info);
+    void deleteClip(ItemInfo info);
     void setScale(double scaleFactor);
     void deleteClip(int clipId);
     void slotAddEffect(QDomElement effect, GenTime pos, int track);
     void addEffect(int track, GenTime pos, QDomElement effect);
     void deleteEffect(int track, GenTime pos, QDomElement effect);
     void updateEffect(int track, GenTime pos, QDomElement effect);
-    void addTransition(int track, GenTime pos, QDomElement transition);
-    void deleteTransition(int track, GenTime pos, QDomElement transition);
+    void addTransition(ItemInfo transitionInfo, int endTrack, QDomElement params);
+    void deleteTransition(ItemInfo transitionInfo, int endTrack, QDomElement params);
+    void updateTransition(int track, GenTime pos,  QDomElement oldTransition, QDomElement transition);
+    void moveTransition(GenTime oldpos, GenTime newpos);
     void activateMonitor();
     int duration() const;
     void deleteSelectedClips();
+    void cutSelectedClips();
     void setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transition);
     void checkTrackHeight();
-    QList <TRACKTYPE> tracksList() const;
+    QList <TrackInfo> tracksList() const;
+    void setTool(PROJECTTOOL tool);
+    void cutClip(ItemInfo info, GenTime cutTime, bool cut);
 
 public slots:
     void setCursorPos(int pos, bool seek = true);
+    void moveCursorPos(int delta);
     void updateCursorPos();
     void slotDeleteEffect(ClipItem *clip, QDomElement effect);
     void slotChangeEffectState(ClipItem *clip, QDomElement effect, bool disable);
     void slotUpdateClipEffect(ClipItem *clip, QDomElement oldeffect, QDomElement effect);
     void slotRefreshEffects(ClipItem *clip);
     void setDuration(int duration);
-    void slotAddTransition(ClipItem* clip , QDomElement transition, GenTime startTime , int startTrack);
+    void slotAddTransition(ClipItem* clip, ItemInfo transitionInfo, int endTrack, QDomElement transition = QDomElement());
+    void slotTransitionUpdated(Transition *, QDomElement);
+    void slotSwitchTrackAudio(int ix);
+    void slotSwitchTrackVideo(int ix);
 
 protected:
     virtual void drawBackground(QPainter * painter, const QRectF & rect);
@@ -94,7 +106,7 @@ private:
     KdenliveDoc *m_document;
     void addItem(DocClipBase *clip, QPoint pos);
     QGraphicsLineItem *m_cursorLine;
-    QPointF m_startPos;
+    ItemInfo m_dragItemInfo;
     OPERATIONTYPE m_operationMode;
     OPERATIONTYPE m_moveOpMode;
     AbstractClipItem *m_dragItem;
@@ -106,11 +118,14 @@ private:
     QPen m_tipPen;
     double m_scale;
     QPoint m_clickPoint;
+    QPoint m_clickEvent;
     QList <GenTime> m_snapPoints;
     void updateSnapPoints(AbstractClipItem *selected);
     double getSnapPointForPos(double pos);
     ClipItem *getClipItemAt(int pos, int track);
     ClipItem *getClipItemAt(GenTime pos, int track);
+    Transition *getTransitionItemAt(int pos, int track);
+    Transition *getTransitionItemAt(GenTime pos, int track);
     void checkScrolling();
     /** Should we auto scroll while playing (keep in sync with KdenliveSettings::autoscroll() */
     bool m_autoScroll;
@@ -118,7 +133,11 @@ private:
     QMenu *m_timelineContextMenu;
     QMenu *m_timelineContextClipMenu;
     QMenu *m_timelineContextTransitionMenu;
-    QList <TRACKTYPE> m_tracksList;
+    QList <TrackInfo> m_tracksList;
+    PROJECTTOOL m_tool;
+    QCursor m_razorCursor;
+    /** Get the index of the video track that is just below current track */
+    int getPreviousVideoTrack(int track);
 
 
 signals: