X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomtrackview.h;h=67f0dc3f6b3e1bfb038c0a4515983c341f801587;hb=7bdee3646c2dfbd8366093c8c9c6b8d675fa5bf1;hp=6ef7a4379aa508b079e9e06cd98548d8209e52c8;hpb=7fff167fb95bb6b13b138b8d3f7b68da8a030473;p=kdenlive

diff --git a/src/customtrackview.h b/src/customtrackview.h
index 6ef7a437..67f0dc3f 100644
--- a/src/customtrackview.h
+++ b/src/customtrackview.h
@@ -58,21 +58,19 @@ public:
     void resizeClip(const ItemInfo start, const ItemInfo end);
     void addClip(QDomElement xml, const QString &clipId, ItemInfo info, EffectsList list = EffectsList());
     void deleteClip(ItemInfo info);
-    void slotAddClipMarker();
-    void slotEditClipMarker();
-    void slotDeleteClipMarker();
-    void slotDeleteAllClipMarkers();
+    void slotDeleteClipMarker(const QString &comment, const QString &id, const GenTime &position);
+    void slotDeleteAllClipMarkers(const QString &id);
     void addMarker(const QString &id, const GenTime &pos, const QString comment);
     void setScale(double scaleFactor);
     void deleteClip(const QString &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, int ix);
+    void updateEffect(int track, GenTime pos, QDomElement effect, int ix, bool triggeredByUser = true);
     void moveEffect(int track, GenTime pos, int oldPos, int newPos);
     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 updateTransition(int track, GenTime pos,  QDomElement oldTransition, QDomElement transition, bool updateTransitionWidget);
     void moveTransition(GenTime oldpos, GenTime newpos);
     void activateMonitor();
     int duration() const;
@@ -94,7 +92,14 @@ public:
     void clipStart();
     void clipEnd();
     void changeClipSpeed();
-    void doChangeClipSpeed(ItemInfo info, double speed, const QString &id);
+    void doChangeClipSpeed(ItemInfo info, const double speed, const double oldspeed, const QString &id);
+    void setDocumentModified();
+    void setInPoint();
+    void setOutPoint();
+    void slotInsertSpace();
+    void slotRemoveSpace();
+    void insertSpace(const GenTime &pos, int track, const GenTime duration, bool add);
+    ClipItem *getActiveClipUnderCursor(bool allowOutsideCursor = false) const;
 
 public slots:
     void setCursorPos(int pos, bool seek = true);
@@ -109,6 +114,7 @@ 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 slotUpdateClip(const QString &clipId);
@@ -123,6 +129,10 @@ public slots:
     void copyClip();
     void pasteClip();
     void pasteClipEffects();
+    void slotUpdateAllThumbs();
+    void slotCheckPositionScrolling();
+    void slotInsertTrack();
+    void slotDeleteTrack();
 
 protected:
     virtual void drawBackground(QPainter * painter, const QRectF & rect);
@@ -138,14 +148,15 @@ protected:
 
 private:
     uint m_tracksHeight;
+    uint m_selectedTrack;
     int m_projectDuration;
     int m_cursorPos;
-    ClipItem *m_dropItem;
+    int m_spacerStart;
     KdenliveDoc *m_document;
     CustomTrackScene *m_scene;
-    void addItem(DocClipBase *clip, QPoint pos);
     QGraphicsLineItem *m_cursorLine;
     ItemInfo m_dragItemInfo;
+    ItemInfo m_selectionGroupInfo;
     OPERATIONTYPE m_operationMode;
     OPERATIONTYPE m_moveOpMode;
     AbstractClipItem *m_dragItem;
@@ -172,14 +183,16 @@ private:
     QMenu *m_timelineContextMenu;
     QMenu *m_timelineContextClipMenu;
     QMenu *m_timelineContextTransitionMenu;
+    QTimer m_scrollTimer;
+    int m_scrollOffset;
 
     QList <CommentedTime> m_searchStrings;
     int m_findIndex;
     PROJECTTOOL m_tool;
     QCursor m_razorCursor;
+    QCursor m_spacerCursor;
     /** list containing items currently copied in the timeline */
     QList<AbstractClipItem *> m_copiedItems;
-    QList<AbstractClipItem *> m_selectedClipList;
     /** Used to get the point in timeline where a context menu was opened */
     QPoint m_menuPosition;
     bool m_blockRefresh;
@@ -191,18 +204,23 @@ private:
     bool canBePastedTo(ItemInfo info, int type) const;
     bool canBePasted(QList<AbstractClipItem *> items, GenTime offset, int trackOffset) const;
     bool canBeMoved(QList<AbstractClipItem *> items, GenTime offset, int trackOffset) const;
+    ClipItem *getClipUnderCursor() const;
+    ClipItem *getMainActiveClip() const;
+    bool insertPossible(AbstractGroupItem *group, const QPoint &pos) const;
+    void resetSelectionGroup();
 
 private slots:
     void slotRefreshGuides();
     void slotEnableRefresh();
+    void slotCheckMouseScrolling();
 
 signals:
     void cursorMoved(int, int);
     void zoomIn();
     void zoomOut();
     void mousePosition(int);
-    void clipItemSelected(ClipItem*);
-    void transitionItemSelected(Transition*);
+    void clipItemSelected(ClipItem*, int ix = -1);
+    void transitionItemSelected(Transition*, bool update = false);
     void activateDocumentMonitor();
     void trackHeightChanged();
     void displayMessage(const QString, MessageType);