Various fixes to improve general stability in Qt 4.5.2

[kdenlive] / src / customtrackview.h

diff --git a/src/customtrackview.h b/src/customtrackview.h
index f708867169fb1409dff5c522ddc269eeb410d9b4..9342d353bb84e03becbbdcf83bca07ee67c9205d 100644 (file)
--- a/src/customtrackview.h
+++ b/src/customtrackview.h
@@ -38,7 +38,8 @@ class AbstractGroupItem;
 class Transition;
 class CustomTrackScene;
 
-class CustomTrackView : public QGraphicsView {
+class CustomTrackView : public QGraphicsView
+{
     Q_OBJECT
 
 public:
@@ -58,27 +59,28 @@ public:
     /** 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, const QString &clipId, ItemInfo info, EffectsList list = EffectsList());
-    void deleteClip(ItemInfo info);
+    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);
     void slotDeleteAllClipMarkers(const QString &id);
     void addMarker(const QString &id, const GenTime &pos, const QString comment);
-    void setScale(double scaleFactor);
+    void setScale(double scaleFactor, double verticalScale);
     void deleteClip(const QString &clipId);
     void slotAddEffect(QDomElement effect, GenTime pos, int track);
+    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 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 addTransition(ItemInfo transitionInfo, int endTrack, QDomElement params, bool refresh);
+    void deleteTransition(ItemInfo transitionInfo, int endTrack, QDomElement params, bool refresh);
     void updateTransition(int track, GenTime pos,  QDomElement oldTransition, QDomElement transition, bool updateTransitionWidget);
     void moveTransition(GenTime oldpos, GenTime newpos);
     void activateMonitor();
     int duration() const;
     void deleteSelectedClips();
     void cutSelectedClips();
-    void setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transition);
+    void setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transition, QActionGroup *clipTypeGroup);
     void checkTrackHeight();
     //QList <TrackInfo> tracksList() const;
     void setTool(PROJECTTOOL tool);
@@ -94,7 +96,7 @@ public:
     void clipStart();
     void clipEnd();
     void changeClipSpeed();
-    void doChangeClipSpeed(ItemInfo info, const double speed, const double oldspeed, const QString &id);
+    void doChangeClipSpeed(ItemInfo info, const double speed, const double oldspeed, int strobe, const QString &id);
     void setDocumentModified();
     void setInPoint();
     void setOutPoint();
@@ -109,6 +111,17 @@ public:
     QStringList getLadspaParams(QDomElement effect) const;
     void initCursorPos(int pos);
     void lockTrack(int ix, bool lock);
+    void groupClips(bool group = true);
+    void doGroupClips(QList <ItemInfo> clipInfos, QList <ItemInfo> transitionInfos, bool group);
+    void loadGroups(const QDomNodeList groups);
+    void splitAudio();
+    void doSplitAudio(const GenTime &pos, int track, bool split);
+    void setVideoOnly();
+    void setAudioOnly();
+    void setAudioAndVideo();
+    void doChangeClipType(const GenTime &pos, int track, bool videoOnly, bool audioOnly);
+    int hasGuide(int pos, int offset);
+    void reloadTransitionLumas();
 
 public slots:
     void setCursorPos(int pos, bool seek = true);
@@ -131,8 +144,8 @@ public slots:
     bool addGuide(const GenTime pos, const QString &comment);
     void slotAddGuide();
     void slotEditGuide(CommentedTime guide);
-    void slotEditGuide();
-    void slotDeleteGuide();
+    void slotEditGuide(int guidePos = -1);
+    void slotDeleteGuide(int guidePos = -1);
     void slotDeleteAllGuides();
     void editGuide(const GenTime oldPos, const GenTime pos, const QString &comment);
     void copyClip();
@@ -155,11 +168,9 @@ protected:
     virtual void wheelEvent(QWheelEvent * e);
     virtual QStringList mimeTypes() const;
     virtual Qt::DropActions supportedDropActions() const;
-    virtual void resizeEvent(QResizeEvent * event);
 
 private:
-    uint m_tracksHeight;
-    uint m_selectedTrack;
+    int m_tracksHeight;
     int m_projectDuration;
     int m_cursorPos;
     KdenliveDoc *m_document;
@@ -186,23 +197,28 @@ private:
     ClipItem *getClipItemAt(GenTime pos, int track);
     ClipItem *getClipItemAtEnd(GenTime pos, int track);
     ClipItem *getClipItemAtStart(GenTime pos, int track);
+    Transition *getTransitionItemAt(int pos, int track);
     Transition *getTransitionItemAt(GenTime pos, int track);
     Transition *getTransitionItemAtEnd(GenTime pos, int track);
     Transition *getTransitionItemAtStart(GenTime pos, int track);
     void checkScrolling();
     /** Should we auto scroll while playing (keep in sync with KdenliveSettings::autoscroll() */
     bool m_autoScroll;
-    void displayContextMenu(QPoint pos, AbstractClipItem *clip = NULL);
+    void displayContextMenu(QPoint pos, AbstractClipItem *clip, AbstractGroupItem *group);
     QMenu *m_timelineContextMenu;
     QMenu *m_timelineContextClipMenu;
     QMenu *m_timelineContextTransitionMenu;
     QAction *m_autoTransition;
-    QAction *m_changeSpeedAction;
     QAction *m_pasteEffectsAction;
+    QAction *m_ungroupAction;
+    QAction *m_editGuide;
+    QAction *m_deleteGuide;
+    QActionGroup *m_clipTypeGroup;
     QTimer m_scrollTimer;
+    QTimer m_thumbsTimer;
     int m_scrollOffset;
+    bool m_clipDrag;
 
-    QList <CommentedTime> m_searchStrings;
     int m_findIndex;
     PROJECTTOOL m_tool;
     QCursor m_razorCursor;
@@ -213,10 +229,11 @@ private:
     QPoint m_menuPosition;
     bool m_blockRefresh;
     AbstractGroupItem *m_selectionGroup;
+    QList <ClipItem *> m_waitingThumbs;
 
     /** Get the index of the video track that is just below current track */
     int getPreviousVideoTrack(int track);
-    void updateClipFade(ClipItem * item, bool updateFadeOut = false);
+    void updateClipFade(ClipItem * item);
     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;
@@ -224,17 +241,22 @@ private:
     ClipItem *getMainActiveClip() const;
     bool insertPossible(AbstractGroupItem *group, const QPoint &pos) const;
     void resetSelectionGroup(bool selectItems = true);
-    void groupSelectedItems(bool force = false);
+    void groupSelectedItems(bool force = false, bool createNewGroup = false);
     /** Get available space for clip move (min and max free positions) */
     void getClipAvailableSpace(AbstractClipItem *item, GenTime &minimum, GenTime &maximum);
     /** Get available space for transition move (min and max free positions) */
     void getTransitionAvailableSpace(AbstractClipItem *item, GenTime &minimum, GenTime &maximum);
-
+    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);
 
 private slots:
     void slotRefreshGuides();
     void slotEnableRefresh();
     void slotCheckMouseScrolling();
+    void slotEditTimeLineGuide();
+    void slotDeleteTimeLineGuide();
+    void slotFetchNextThumbs();
 
 signals:
     void cursorMoved(int, int);
@@ -242,7 +264,7 @@ signals:
     void zoomOut();
     void mousePosition(int);
     void clipItemSelected(ClipItem*, int ix = -1);
-    void transitionItemSelected(Transition*, bool update = false);
+    void transitionItemSelected(Transition*, int track = 0, QPoint p = QPoint(), bool update = false);
     void activateDocumentMonitor();
     void trackHeightChanged();
     void displayMessage(const QString, MessageType);