Don't allow clip moving over another one

[kdenlive] / src / customtrackview.h

diff --git a/src/customtrackview.h b/src/customtrackview.h
index 2a4e5d24bddd1bb7664d269b07a93e9bd6d52639..186c2d64161938a70cdae6909e7280d62a439c53 100644 (file)
--- a/src/customtrackview.h
+++ b/src/customtrackview.h
@@ -34,13 +34,15 @@
 
 class ClipItem;
 class AbstractClipItem;
+class AbstractGroupItem;
 class Transition;
+class CustomTrackScene;
 
 class CustomTrackView : public QGraphicsView {
     Q_OBJECT
 
 public:
-    CustomTrackView(KdenliveDoc *doc, QGraphicsScene * projectscene, QWidget *parent = 0);
+    CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscene, QWidget *parent = 0);
     virtual ~ CustomTrackView();
     virtual void mousePressEvent(QMouseEvent * event);
     virtual void mouseReleaseEvent(QMouseEvent * event);
@@ -54,15 +56,15 @@ 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, int clipId, ItemInfo info, EffectsList list = EffectsList());
+    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 addMarker(const int id, const GenTime &pos, const QString comment);
+    void addMarker(const QString &id, const GenTime &pos, const QString comment);
     void setScale(double scaleFactor);
-    void deleteClip(int clipId);
+    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);
@@ -92,7 +94,8 @@ public:
     void clipStart();
     void clipEnd();
     void changeClipSpeed();
-    void doChangeClipSpeed(ItemInfo info, double speed, int id);
+    void doChangeClipSpeed(ItemInfo info, double speed, const QString &id);
+    void setDocumentModified();
 
 public slots:
     void setCursorPos(int pos, bool seek = true);
@@ -109,8 +112,8 @@ public slots:
     void slotTransitionUpdated(Transition *, QDomElement);
     void slotSwitchTrackAudio(int ix);
     void slotSwitchTrackVideo(int ix);
-    void slotUpdateClip(int clipId);
-    void slotAddClipMarker(int id, GenTime t, QString c);
+    void slotUpdateClip(const QString &clipId);
+    void slotAddClipMarker(const QString &id, GenTime t, QString c);
     bool addGuide(const GenTime pos, const QString &comment);
     void slotAddGuide();
     void slotEditGuide(CommentedTime guide);
@@ -136,10 +139,12 @@ protected:
 
 private:
     uint m_tracksHeight;
+    uint m_selectedTrack;
     int m_projectDuration;
     int m_cursorPos;
     ClipItem *m_dropItem;
     KdenliveDoc *m_document;
+    CustomTrackScene *m_scene;
     void addItem(DocClipBase *clip, QPoint pos);
     QGraphicsLineItem *m_cursorLine;
     ItemInfo m_dragItemInfo;
@@ -153,10 +158,8 @@ private:
     QTimeLine *m_animationTimer;
     QColor m_tipColor;
     QPen m_tipPen;
-    double m_scale;
     QPoint m_clickPoint;
     QPoint m_clickEvent;
-    QList <GenTime> m_snapPoints;
     QList <CommentedTime> m_searchPoints;
     QList <Guide *> m_guides;
     void updateSnapPoints(AbstractClipItem *selected);
@@ -171,7 +174,7 @@ private:
     QMenu *m_timelineContextMenu;
     QMenu *m_timelineContextClipMenu;
     QMenu *m_timelineContextTransitionMenu;
-    QList <TrackInfo> m_tracksList;
+
     QList <CommentedTime> m_searchStrings;
     int m_findIndex;
     PROJECTTOOL m_tool;
@@ -182,6 +185,7 @@ private:
     /** Used to get the point in timeline where a context menu was opened */
     QPoint m_menuPosition;
     bool m_blockRefresh;
+    AbstractGroupItem *m_selectionGroup;
 
     /** Get the index of the video track that is just below current track */
     int getPreviousVideoTrack(int track);