X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomtrackview.h;h=31baffa9ae8edd7e88055ff2d40cc34dade10611;hb=4ae3260592acc87712db77b7d3fe0cc2be7d76bc;hp=7898885a60bdde5794e57fc114ae4f2d9216575b;hpb=8aeb94aa3122e5576122c132bfec01fb4360e56f;p=kdenlive diff --git a/src/customtrackview.h b/src/customtrackview.h index 7898885a..31baffa9 100644 --- a/src/customtrackview.h +++ b/src/customtrackview.h @@ -55,11 +55,11 @@ public: virtual void mouseReleaseEvent(QMouseEvent * event); virtual void mouseMoveEvent(QMouseEvent * event); virtual void mouseDoubleClickEvent(QMouseEvent *event); - void addTrack(TrackInfo type, int ix = -1); + void addTrack(const TrackInfo &type, int ix = -1); void removeTrack(int ix); /** @brief Makes the document use new track infos (name, type, ...). */ - void configTracks(QList trackInfos); - int cursorPos(); + void configTracks(const QList &trackInfos); + int cursorPos() const; void checkAutoScroll(); /** Move the clip at \c start to \c end. @@ -68,7 +68,7 @@ public: For example, attempting to move a clip to t = -1 s will actually move it to t = 0 s. */ bool moveClip(const ItemInfo &start, const ItemInfo &end, bool refresh, ItemInfo *out_actualEnd = NULL); - void moveGroup(QList startClip, QList startTransition, const GenTime &offset, const int trackOffset, bool reverseMove = false); + void moveGroup(QList startClip, QList 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, bool refresh); void resizeClip(const ItemInfo &start, const ItemInfo &end, bool dontWorry = false); @@ -76,25 +76,24 @@ 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 slotAddEffect(QDomElement effect, const GenTime &pos, int track); void slotAddGroupEffect(QDomElement effect, AbstractGroupItem *group, AbstractClipItem *dropTarget = NULL); void addEffect(int track, GenTime pos, QDomElement effect); - void deleteEffect(int track, GenTime pos, QDomElement effect); + void deleteEffect(int track, const GenTime &pos, const QDomElement &effect); void updateEffect(int track, GenTime pos, QDomElement insertedEffect, bool refreshEffectStack = false); /** @brief Enable / disable a list of effects */ void updateEffectState(int track, GenTime pos, QList effectIndexes, bool disable, bool updateEffectStack); void moveEffect(int track, GenTime pos, QList oldPos, QList newPos); - void addTransition(ItemInfo transitionInfo, int endTrack, QDomElement params, bool refresh); - void deleteTransition(ItemInfo transitionInfo, int endTrack, QDomElement params, bool refresh); + void addTransition(const ItemInfo &transitionInfo, int endTrack, const QDomElement ¶ms, bool refresh); + void deleteTransition(const 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(); @@ -105,7 +104,7 @@ public: void updateSceneFrameWidth(); //QList tracksList() const; void setTool(PROJECTTOOL tool); - ClipItem *cutClip(ItemInfo info, GenTime cutTime, bool cut, EffectsList oldStack = EffectsList(), bool execute = true); + ClipItem *cutClip(const ItemInfo &info, const GenTime &cutTime, bool cut, const EffectsList &oldStack = EffectsList(), bool execute = true); void slotSeekToPreviousSnap(); void slotSeekToNextSnap(); double getSnapPointForPos(double pos); @@ -204,13 +203,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); @@ -247,7 +249,7 @@ public slots: /** @brief Shows a dialog for adding a guide. * @param dialog (default = true) false = do not show the dialog but use current position as position and comment */ void slotAddGuide(bool dialog = true); - void slotEditGuide(CommentedTime guide); + void slotEditGuide(const CommentedTime &guide); void slotEditGuide(int guidePos = -1); void slotDeleteGuide(int guidePos = -1); void slotDeleteAllGuides(); @@ -273,7 +275,7 @@ 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); @@ -293,7 +295,7 @@ public slots: * @param skipSelectedItems if true, the selected item start and end points will not be added to snap list */ void updateSnapPoints(AbstractClipItem *selected, QList offsetList = QList (), bool skipSelectedItems = false); - void slotAddEffect(ClipItem *clip, QDomElement effect); + void slotAddEffect(ClipItem *clip, const QDomElement &effect); void slotImportClipKeyframes(GRAPHICSRECTITEM type); /** @brief Get effect parameters ready for MLT*/ @@ -383,6 +385,7 @@ private: int m_selectedTrack; int m_spacerOffset; + QMutex m_selectionMutex; QMutex m_mutex; QWaitCondition m_producerNotReady; KStatefulBrush m_activeTrackBrush; @@ -396,7 +399,7 @@ private: /** Get the index of the video track that is just below current track */ int getPreviousVideoTrack(int track); - void updatePositionEffects(ClipItem * item, ItemInfo info, bool standalone = true); + void updatePositionEffects(ClipItem * item, const ItemInfo &info, bool standalone = true); bool insertDropClips(const QMimeData *data, const QPoint &pos); bool canBePastedTo(QList infoList, int type) const; bool canBePasted(QList items, GenTime offset, int trackOffset) const; @@ -411,7 +414,7 @@ private: 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); + bool itemCollision(AbstractClipItem *item, const 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 checkForGroups(const QRectF &rect, bool *ok); /** Adjust clips under another one when working in overwrite mode */