Fix spacer timeline corruption, fix possible corruption when moving a group with...

[kdenlive] / src / customtrackview.h

diff --git a/src/customtrackview.h b/src/customtrackview.h
index 70ef447cb808369955681fa9b1b2a69dec9f36ed..2370fc7b11239bedcd851a090157a7587c07b9f6 100644 (file)
--- a/src/customtrackview.h
+++ b/src/customtrackview.h
@@ -122,6 +122,8 @@ public:
     void doChangeClipType(const GenTime &pos, int track, bool videoOnly, bool audioOnly);
     int hasGuide(int pos, int offset);
     void reloadTransitionLumas();
+    void updateProjectFps();
+    double fps() const;
 
 public slots:
     void setCursorPos(int pos, bool seek = true);
@@ -139,7 +141,7 @@ public slots:
     void slotSwitchTrackAudio(int ix);
     void slotSwitchTrackVideo(int ix);
     void slotSwitchTrackLock(int ix);
-    void slotUpdateClip(const QString &clipId);
+    void slotUpdateClip(const QString &clipId, bool reload = true);
     void slotAddClipMarker(const QString &id, GenTime t, QString c);
     bool addGuide(const GenTime pos, const QString &comment);
     void slotAddGuide();
@@ -250,6 +252,8 @@ private:
     void updateClipTypeActions(ClipItem *clip);
     /** Whether an item can be moved to a new position without colliding with similar items */
     bool itemCollision(AbstractClipItem *item, ItemInfo newPos);
+    /** 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);
 
 private slots:
     void slotRefreshGuides();
@@ -271,6 +275,7 @@ signals:
     void displayMessage(const QString, MessageType);
     void showClipFrame(DocClipBase *, const int);
     void doTrackLock(int, bool);
+    void updateClipMarkers(DocClipBase *);
 };
 
 #endif