Fix indent, use const'ref, use explicit when necessary

[kdenlive] / src / customtrackview.h

diff --git a/src/customtrackview.h b/src/customtrackview.h
index f27f9710d489ee7a850bf5f1e3d6bcdbd30c49e8..3dff40620ad8147aec4af5bbb21c36b8c215385b 100644 (file)
--- a/src/customtrackview.h
+++ b/src/customtrackview.h
@@ -76,10 +76,12 @@ public:
     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 CommentedTime marker);
+    void addMarker(const QString &id, const CommentedTime &marker);
     void addData(const QString &id, const QString &key, const QString &data);
     void setScale(double scaleFactor, double verticalScale);
     void deleteClip(const QString &clipId);
+    /** @brief An effect was dropped on @param clip */
+    void slotDropEffect(ClipItem *clip, QDomElement effect, GenTime pos, int track);
     /** @brief Add effect to current clip */
     void slotAddEffect(QDomElement effect, GenTime pos, int track);
     void slotAddGroupEffect(QDomElement effect, AbstractGroupItem *group, AbstractClipItem *dropTarget = NULL);
@@ -103,7 +105,7 @@ public:
     void updateSceneFrameWidth();
     //QList <TrackInfo> tracksList() const;
     void setTool(PROJECTTOOL tool);
-    ClipItem *cutClip(ItemInfo info, GenTime cutTime, bool cut, bool execute = true);
+    ClipItem *cutClip(ItemInfo info, GenTime cutTime, bool cut, EffectsList oldStack = EffectsList(), bool execute = true);
     void slotSeekToPreviousSnap();
     void slotSeekToNextSnap();
     double getSnapPointForPos(double pos);
@@ -142,7 +144,7 @@ public:
     *
     * Makes sure no clip on track to lock is selected. */
     void lockTrack(int ix, bool lock, bool requestUpdate = true);
-    void groupClips(bool group = true);
+    void groupClips(bool group = true, QList<QGraphicsItem *> itemList = QList<QGraphicsItem *>(), QUndoCommand *command = NULL);
     void doGroupClips(QList <ItemInfo> clipInfos, QList <ItemInfo> transitionInfos, bool group);
     void loadGroups(const QDomNodeList &groups);
 
@@ -202,13 +204,16 @@ public:
     * Check whether given track has a clip with audio in it. */
     bool hasAudio(int track) const;
 
-    int getFrameWidth();
+    int getFrameWidth() const;
     /** @brief Returns last requested seeking pos (or SEEK_INACTIVE if no seek). */
     int seekPosition() const;
 
     /** @brief Trigger a monitor refresh. */
     void monitorRefresh();
     
+    /** @brief Returns frame number of current mouse position. */
+    int getMousePos() const;
+    
 public slots:
     /** @brief Send seek request to MLT. */
     void seekCursorPos(int pos);
@@ -271,22 +276,11 @@ public slots:
     /** @brief Rebuilds a group to fit again after children changed.
     * @param childTrack the track of one of the groups children
     * @param childPos The position of the same child */
-    void rebuildGroup(int childTrack, GenTime childPos);
+    void rebuildGroup(int childTrack, const GenTime &childPos);
     /** @brief Rebuilds a group to fit again after children changed.
     * @param group The group to rebuild */
     void rebuildGroup(AbstractGroupItem *group);
 
-    /** @brief Cuts a group into two parts.
-    * @param clips1 Clips before the cut
-    * @param transitions1 Transitions before the cut
-    * @param clipsCut Clips that need to be cut
-    * @param transitionsCut Transitions that need to be cut
-    * @param clips2 Clips behind the cut
-    * @param transitions2 Transitions behind the cut
-    * @param cutPos Absolute position of the cut
-    * @param cut true = cut, false = "uncut" */
-    void slotRazorGroup(QList <ItemInfo> clips1, QList <ItemInfo> transitions1, QList <ItemInfo> clipsCut, QList <ItemInfo> transitionsCut, QList <ItemInfo> clips2, QList <ItemInfo> transitions2, GenTime cutPos, bool cut);
-
     /** @brief Add en effect to a track.
     * @param effect The new effect xml
     * @param ix The track index */
@@ -307,6 +301,8 @@ public slots:
 
     /** @brief Get effect parameters ready for MLT*/
     static void adjustEffectParameters(EffectsParameterList &parameters, QDomNodeList params, MltVideoProfile profile, const QString &prefix = QString());
+       /** @brief Move playhead to mouse curser position if defined key is pressed */
+    void slotAlignPlayheadToMousePos();
 
 protected:
     virtual void drawBackground(QPainter * painter, const QRectF & rect);
@@ -368,6 +364,8 @@ private:
     QAction *m_ungroupAction;
     QAction *m_editGuide;
     QAction *m_deleteGuide;
+    QList <QAction*> m_audioActions;
+    QList <QAction*> m_avActions;
     QActionGroup *m_clipTypeGroup;
     QTimer m_scrollTimer;
     QTimer m_thumbsTimer;
@@ -388,6 +386,7 @@ private:
     int m_selectedTrack;
     int m_spacerOffset;
 
+    QMutex m_selectionMutex;
     QMutex m_mutex;
     QWaitCondition m_producerNotReady;
     KStatefulBrush m_activeTrackBrush;
@@ -409,7 +408,7 @@ private:
     ClipItem *getClipUnderCursor() const;
     AbstractClipItem *getMainActiveClip() const;
     void resetSelectionGroup(bool selectItems = true);
-    void groupSelectedItems(QList <QGraphicsItem *> selection = QList <QGraphicsItem *>(), bool force = false, bool createNewGroup = false, bool selectNewGroup = false);
+    void groupSelectedItems(QList <QGraphicsItem *> selection = QList <QGraphicsItem *>(), bool createNewGroup = false, bool selectNewGroup = 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) */
@@ -530,7 +529,7 @@ signals:
     /** @brief Cursor position changed, repaint ruler.*/
     void updateRuler();
     /** @brief Send data from a clip to be imported as keyframes for effect / transition.*/
-    void importKeyframes(GRAPHICSRECTITEM type, const QString&);
+    void importKeyframes(GRAPHICSRECTITEM type, const QString&, int maximum);
 };
 
 #endif