reindent + nice (working) progress bar for document loading

[kdenlive] / src / customtrackview.h

diff --git a/src/customtrackview.h b/src/customtrackview.h
index dece5d42ba7095194da7cbec4143e726a1d54741..2370fc7b11239bedcd851a090157a7587c07b9f6 100644 (file)
--- a/src/customtrackview.h
+++ b/src/customtrackview.h
@@ -54,11 +54,11 @@ public:
     void changeTrack(int ix, TrackInfo type);
     int cursorPos();
     void checkAutoScroll();
-    void moveClip(const ItemInfo start, const ItemInfo end);
+    void moveClip(const ItemInfo start, const ItemInfo end, bool refresh);
     void moveGroup(QList <ItemInfo> startClip, QList <ItemInfo> startTransition, const GenTime offset, const int trackOffset, bool reverseMove = false);
     /** 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 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 deleteClip(ItemInfo info, bool refresh = true);
     void slotDeleteClipMarker(const QString &comment, const QString &id, const GenTime &position);
@@ -70,7 +70,7 @@ public:
     void slotAddGroupEffect(QDomElement effect, AbstractGroupItem *group);
     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, bool triggeredByUser = true);
+    void updateEffect(int track, GenTime pos, QDomElement insertedEffect, int ix, bool triggeredByUser = true);
     void moveEffect(int track, GenTime pos, int oldPos, int newPos);
     void addTransition(ItemInfo transitionInfo, int endTrack, QDomElement params, bool refresh);
     void deleteTransition(ItemInfo transitionInfo, int endTrack, QDomElement params, bool refresh);
@@ -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();
@@ -240,7 +242,7 @@ private:
     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;
+    AbstractClipItem *getMainActiveClip() const;
     void resetSelectionGroup(bool selectItems = true);
     void groupSelectedItems(bool force = false, bool createNewGroup = false);
     /** Get available space for clip move (min and max free positions) */
@@ -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