X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomtrackview.h;h=1c3e33a91a9e27e318b146b0ee2bae49bd5e755a;hb=02188f8892627bffa8c7b3a971a9be8624e370bc;hp=1bbe77f299086a8c0df4fbd0cfaef93f53476fd2;hpb=b61080cba46daa3b44dcc7992c68f91534b3ab27;p=kdenlive

diff --git a/src/customtrackview.h b/src/customtrackview.h
index 1bbe77f2..1c3e33a9 100644
--- a/src/customtrackview.h
+++ b/src/customtrackview.h
@@ -59,7 +59,7 @@ public:
     /** move transition, startPos = (old start, old end), endPos = (new start, new end) */
     void moveTransition(const ItemInfo start, const ItemInfo end, bool m_refresh);
     void resizeClip(const ItemInfo start, const ItemInfo end, bool dontWorry = false);
-    void addClip(QDomElement xml, const QString &clipId, ItemInfo info, EffectsList list = EffectsList(), bool refresh = true);
+    void addClip(QDomElement xml, const QString &clipId, ItemInfo info, EffectsList list = EffectsList(), bool overwrite = false, bool push = false, bool refresh = true);
     void deleteClip(ItemInfo info, bool refresh = true);
     void slotDeleteClipMarker(const QString &comment, const QString &id, const GenTime &position);
     void slotDeleteAllClipMarkers(const QString &id);
@@ -129,7 +129,7 @@ public:
     void selectTransition(bool add, bool group = false);
     QStringList extractTransitionsLumas();
     void setEditMode(EDITMODE mode);
-
+    void insertClipCut(DocClipBase *clip, int in, int out);
 
 public slots:
     void setCursorPos(int pos, bool seek = true);
@@ -168,6 +168,7 @@ public slots:
     void slotTrackUp();
     void slotTrackDown();
     void slotSelectTrack(int ix);
+    void insertZoneOverwrite(QStringList data, int in);
 
 protected:
     virtual void drawBackground(QPainter * painter, const QRectF & rect);
@@ -243,6 +244,7 @@ private:
     AbstractGroupItem *m_selectionGroup;
     QList <ClipItem *> m_waitingThumbs;
     int m_selectedTrack;
+    int m_spacerOffset;
 
     /** Get the index of the video track that is just below current track */
     int getPreviousVideoTrack(int track);
@@ -266,7 +268,10 @@ private:
     /** Selects all items in the scene rect, and sets ok to false if a group going over several tracks is found in it */
     QList<QGraphicsItem *> checkForGroups(const QRectF &rect, bool *ok);
     /** Adjust clips under another one when working in overwrite mode */
-    void adjustTimelineClips(EDITMODE mode, AbstractClipItem *item, QUndoCommand *command);
+    void adjustTimelineClips(EDITMODE mode, ClipItem *item, ItemInfo posinfo, QUndoCommand *command);
+    void adjustTimelineTransitions(EDITMODE mode, Transition *item, QUndoCommand *command);
+    /** Adjust keyframes when pasted to another clip */
+    void adjustKeyfames(GenTime oldstart, GenTime newstart, GenTime duration, QDomElement xml);
 
 private slots:
     void slotRefreshGuides();
@@ -275,6 +280,7 @@ private slots:
     void slotEditTimeLineGuide();
     void slotDeleteTimeLineGuide();
     void slotFetchNextThumbs();
+    void checkTrackSequence(int track);
 
 signals:
     void cursorMoved(int, int);
@@ -287,10 +293,11 @@ signals:
     void trackHeightChanged();
     void tracksChanged();
     void displayMessage(const QString, MessageType);
-    void showClipFrame(DocClipBase *, const int);
+    void showClipFrame(DocClipBase *, QPoint, const int);
     void doTrackLock(int, bool);
     void updateClipMarkers(DocClipBase *);
     void updateTrackHeaders();
+    void playMonitor();
 };
 
 #endif