X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomtrackview.h;h=d8d8ad4eecbf4ca65859bbb1909ea39da82091cf;hb=79115f0c91d8239e074baedc070d392297f3fc4b;hp=015a2fe15089b13bff84ec405a79ac9d9c1c08ba;hpb=b1d2b276bea14afb4720b00b7b546c2b9272d516;p=kdenlive diff --git a/src/customtrackview.h b/src/customtrackview.h index 015a2fe1..d8d8ad4e 100644 --- a/src/customtrackview.h +++ b/src/customtrackview.h @@ -42,6 +42,7 @@ class ClipItem; class AbstractClipItem; class AbstractGroupItem; class Transition; +class AudioCorrelation; class CustomTrackView : public QGraphicsView { @@ -54,14 +55,20 @@ 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(); - void moveClip(const ItemInfo &start, const ItemInfo &end, bool refresh); - void moveGroup(QList startClip, QList startTransition, const GenTime &offset, const int trackOffset, bool reverseMove = false); + /** + Move the clip at \c start to \c end. + + If \c out_actualEnd is not NULL, it will be set to the position the clip really ended up at. + 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); /** 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); @@ -69,19 +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 GenTime &pos, const QString &comment); + 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); - void slotAddEffect(QDomElement effect, GenTime pos, int track); - void slotAddGroupEffect(QDomElement effect, AbstractGroupItem *group); + /** @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, 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 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); - void updateTransition(int track, GenTime pos, QDomElement oldTransition, QDomElement transition, bool updateTransitionWidget); - void moveTransition(GenTime oldpos, GenTime newpos); + 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, const GenTime &pos, const QList &oldPos, const QList &newPos); + 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, const GenTime &pos, const QDomElement &oldTransition, const QDomElement &transition, bool updateTransitionWidget); void activateMonitor(); int duration() const; void deleteSelectedClips(); @@ -92,7 +104,7 @@ public: void updateSceneFrameWidth(); //QList tracksList() const; void setTool(PROJECTTOOL tool); - ClipItem *cutClip(ItemInfo info, GenTime cutTime, bool cut, 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); @@ -105,7 +117,7 @@ public: QList findId(const QString &clipId); void clipStart(); void clipEnd(); - void doChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, const double speed, const double oldspeed, int strobe, const QString &id); + void doChangeClipSpeed(ItemInfo info, const ItemInfo &speedIndependantInfo, const double speed, const double oldspeed, int strobe, const QString &id); /** @brief Sets the document as modified. */ void setDocumentModified(); void setInPoint(); @@ -131,13 +143,19 @@ 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 itemList = QList(), QUndoCommand *command = NULL); void doGroupClips(QList clipInfos, QList transitionInfos, bool group); void loadGroups(const QDomNodeList &groups); /** @brief Creates SplitAudioCommands for selected clips. */ void splitAudio(); + /// Define which clip to take as reference for automatic audio alignment + void setAudioAlignReference(); + + /// Automatically align the currently selected clips to synchronize their audio with the reference's audio + void alignAudio(); + /** @brief Seperates the audio of a clip to a audio track. * @param pos Position of the clip to split * @param track Track of the clip @@ -185,16 +203,27 @@ 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: - void setCursorPos(int pos, bool seek = true); + /** @brief Send seek request to MLT. */ + void seekCursorPos(int pos); + /** @brief Move timeline cursor to new position. */ + void setCursorPos(int pos); void moveCursorPos(int delta); void updateCursorPos(); void slotDeleteEffect(ClipItem *clip, int track, QDomElement effect, bool affectGroup = true); - void slotChangeEffectState(ClipItem *clip, int track, int effectPos, bool disable); - void slotChangeEffectPosition(ClipItem *clip, int track, int currentPos, int newPos); - void slotUpdateClipEffect(ClipItem *clip, int track, QDomElement oldeffect, QDomElement effect, int ix); + void slotChangeEffectState(ClipItem *clip, int track, QList effectIndexes, bool disable); + void slotChangeEffectPosition(ClipItem *clip, int track, QList currentPos, int newPos); + void slotUpdateClipEffect(ClipItem *clip, int track, QDomElement oldeffect, QDomElement effect, int ix, bool refreshEffectStack = true); void slotUpdateClipRegion(ClipItem *clip, int ix, QString region); void slotRefreshEffects(ClipItem *clip); void setDuration(int duration); @@ -205,18 +234,22 @@ public slots: void slotSwitchTrackVideo(int ix); void slotSwitchTrackLock(int ix); void slotUpdateClip(const QString &clipId, bool reload = true); - + + /** @brief Add extra data to a clip. */ + void slotAddClipExtraData(const QString &id, const QString &key, const QString &data = QString(), QUndoCommand *groupCommand = 0); /** @brief Creates a AddClipCommand to add, edit or delete a marker. * @param id Id of the marker's clip * @param t Position of the marker * @param c Comment of the marker */ - void slotAddClipMarker(const QString &id, GenTime t, QString c); + void slotAddClipMarker(const QString &id, QList newMarker, QUndoCommand *groupCommand = 0); + void slotLoadClipMarkers(const QString &id); + void slotSaveClipMarkers(const QString &id); bool addGuide(const GenTime &pos, const QString &comment); /** @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(); @@ -242,22 +275,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 clips1, QList transitions1, QList clipsCut, QList transitionsCut, QList clips2, QList transitions2, GenTime cutPos, bool cut); - /** @brief Add en effect to a track. * @param effect The new effect xml * @param ix The track index */ @@ -273,7 +295,13 @@ 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*/ + static void adjustEffectParameters(EffectsParameterList ¶meters, 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); @@ -317,6 +345,7 @@ private: ClipItem *getClipItemAt(GenTime pos, int track); ClipItem *getClipItemAtEnd(GenTime pos, int track); ClipItem *getClipItemAtStart(GenTime pos, int track); + Transition *getTransitionItem(TransitionInfo info); Transition *getTransitionItemAt(int pos, int track); Transition *getTransitionItemAt(GenTime pos, int track); Transition *getTransitionItemAtEnd(GenTime pos, int track); @@ -334,6 +363,8 @@ private: QAction *m_ungroupAction; QAction *m_editGuide; QAction *m_deleteGuide; + QList m_audioActions; + QList m_avActions; QActionGroup *m_clipTypeGroup; QTimer m_scrollTimer; QTimer m_thumbsTimer; @@ -354,17 +385,21 @@ private: int m_selectedTrack; int m_spacerOffset; + QMutex m_selectionMutex; QMutex m_mutex; QWaitCondition m_producerNotReady; KStatefulBrush m_activeTrackBrush; + AudioCorrelation *m_audioCorrelator; + ClipItem *m_audioAlignmentReference; + /** stores the state of the control modifier during mouse press. * Will then be used to identify whether we resize a group or only one item of it. */ bool m_controlModifier; /** 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; @@ -372,14 +407,14 @@ private: ClipItem *getClipUnderCursor() const; AbstractClipItem *getMainActiveClip() const; void resetSelectionGroup(bool selectItems = true); - void groupSelectedItems(bool force = false, bool createNewGroup = false); + void groupSelectedItems(QList selection = QList (), 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) */ 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 */ @@ -441,6 +476,9 @@ private: * @param fromStart false = resize from end * @param command Used as a parent for EditEffectCommand */ void adjustEffects(ClipItem *item, ItemInfo oldInfo, QUndoCommand *command); + + /** @brief Prepare an add clip command for an effect */ + void processEffect(ClipItem *item, QDomElement effect, int offset, QUndoCommand *effectCommand); private slots: void slotRefreshGuides(); @@ -458,7 +496,7 @@ private slots: * @param resetThumbs Should we recreate the timeline thumbnails. */ void slotRefreshThumbs(const QString &id, bool resetThumbs); /** @brief A Filter job producer results. */ - void slotGotFilterJobResults(const QString &id, int startPos, int track, const QString &filter, stringMap filterParams); + void slotGotFilterJobResults(const QString &id, int startPos, int track, stringMap filterParams, stringMap extra); signals: @@ -468,9 +506,8 @@ signals: void mousePosition(int); /** @brief A clip was selected in timeline, update the effect stack * @param clip The clip - * @param ix The index of currently selected effect * @param raise If true, the effect stack widget will be raised (come to front). */ - void clipItemSelected(ClipItem *clip, int ix = -1, bool raise = true); + void clipItemSelected(ClipItem *clip, bool raise = true); void transitionItemSelected(Transition*, int track = 0, QPoint p = QPoint(), bool update = false); void activateDocumentMonitor(); void trackHeightChanged(); @@ -479,6 +516,7 @@ signals: void showClipFrame(DocClipBase *, QPoint, bool, const int); void doTrackLock(int, bool); void updateClipMarkers(DocClipBase *); + void updateClipExtraData(DocClipBase *); void updateTrackHeaders(); void playMonitor(); /** @brief Monitor document changes (for example the presence of audio data in timeline for export widget.*/ @@ -487,6 +525,10 @@ signals: void showTrackEffects(int, TrackInfo); /** @brief Update the track effect button that shows if a track has effects or not.*/ void updateTrackEffectState(int); + /** @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&, int maximum); }; #endif