X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomtrackview.h;h=7db48f597959e7694603ca20248f7ec8b6c7220d;hb=e5bed1802f629406c47711f2a6e26f7c0286b11f;hp=99482e9ec0e0d167e0b230dc39d02095d67be16d;hpb=62b517a3d5fc09dd9288261f9155dfd61a19d72c;p=kdenlive diff --git a/src/customtrackview.h b/src/customtrackview.h index 99482e9e..7db48f59 100644 --- a/src/customtrackview.h +++ b/src/customtrackview.h @@ -21,7 +21,7 @@ #ifndef CUSTOMTRACKVIEW_H #define CUSTOMTRACKVIEW_H -#include +#include #include #include @@ -42,6 +42,7 @@ class ClipItem; class AbstractClipItem; class AbstractGroupItem; class Transition; +class AudioCorrelation; class CustomTrackView : public QGraphicsView { @@ -60,24 +61,34 @@ public: void configTracks(QList trackInfos); int cursorPos(); 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 m_refresh); - void resizeClip(const ItemInfo start, const ItemInfo end, bool dontWorry = false); + void moveTransition(const ItemInfo &start, const ItemInfo &end, bool refresh); + void resizeClip(const ItemInfo &start, const ItemInfo &end, bool dontWorry = false); void addClip(QDomElement xml, const QString &clipId, ItemInfo info, EffectsList list = EffectsList(), bool overwrite = false, bool push = false, 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 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 Add effect to current clip */ void slotAddEffect(QDomElement effect, GenTime pos, int track); - void slotAddGroupEffect(QDomElement effect, AbstractGroupItem *group); + 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 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 updateTransition(int track, GenTime pos, QDomElement oldTransition, QDomElement transition, bool updateTransitionWidget); @@ -88,14 +99,15 @@ public: /** @brief Cuts all clips that are selected at the timeline cursor position. */ void cutSelectedClips(); void setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transition, QActionGroup *clipTypeGroup, QMenu *markermenu); - void checkTrackHeight(); + bool checkTrackHeight(); + void updateSceneFrameWidth(); //QList tracksList() const; void setTool(PROJECTTOOL tool); ClipItem *cutClip(ItemInfo info, GenTime cutTime, bool cut, bool execute = true); void slotSeekToPreviousSnap(); void slotSeekToNextSnap(); double getSnapPointForPos(double pos); - void editKeyFrame(const GenTime pos, const int track, const int index, const QString keyframes); + void editKeyFrame(const GenTime &pos, const int track, const int index, const QString &keyframes); bool findString(const QString &text); void selectFound(QString track, QString pos); bool findNextString(const QString &text); @@ -104,7 +116,6 @@ public: QList findId(const QString &clipId); void clipStart(); void clipEnd(); - void changeClipSpeed(); void doChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, const double speed, const double oldspeed, int strobe, const QString &id); /** @brief Sets the document as modified. */ void setDocumentModified(); @@ -117,12 +128,11 @@ public: void slotInsertSpace(); /** @brief Prepares removing space. */ void slotRemoveSpace(); - void insertSpace(QList clipsToMove, QList transToMove, int track, const GenTime duration, const GenTime offset); + void insertSpace(QList clipsToMove, QList transToMove, int track, const GenTime &duration, const GenTime &offset); ClipItem *getActiveClipUnderCursor(bool allowOutsideCursor = false) const; void deleteTimelineTrack(int ix, TrackInfo trackinfo); void saveThumbnails(); void autoTransition(); - QStringList getLadspaParams(QDomElement effect) const; void initCursorPos(int pos); /** @brief Locks or unlocks a track. @@ -134,16 +144,22 @@ public: void lockTrack(int ix, bool lock, bool requestUpdate = true); void groupClips(bool group = true); void doGroupClips(QList clipInfos, QList transitionInfos, bool group); - void loadGroups(const QDomNodeList groups); + 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 * @param split Split or unsplit */ - void doSplitAudio(const GenTime &pos, int track, bool split); + void doSplitAudio(const GenTime &pos, int track, EffectsList effects, bool split); void setVideoOnly(); void setAudioOnly(); void setAudioAndVideo(); @@ -175,10 +191,9 @@ public: * * Inserts at the position of timeline cursor and selected track. */ void insertClipCut(DocClipBase *clip, int in, int out); - void clearSelection(); + void clearSelection(bool emitInfo = true); void editItemDuration(); void buildGuidesMenu(QMenu *goMenu) const; - KImageCache* m_pixmapCache; /** update the timeline objects when palette changes */ void updatePalette(); /** @brief Returns true if a track has audio data on it. @@ -187,14 +202,21 @@ public: * Check whether given track has a clip with audio in it. */ bool hasAudio(int track) const; + int getFrameWidth(); + /** @brief Returns last requested seeking pos (or SEEK_INACTIVE if no seek). */ + int seekPosition() 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,13 +227,17 @@ 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); - bool addGuide(const GenTime pos, const QString &comment); + 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 */ @@ -220,7 +246,7 @@ public slots: void slotEditGuide(int guidePos = -1); void slotDeleteGuide(int guidePos = -1); void slotDeleteAllGuides(); - void editGuide(const GenTime oldPos, const GenTime pos, const QString &comment); + void editGuide(const GenTime &oldPos, const GenTime &pos, const QString &comment); void copyClip(); void pasteClip(); void pasteClipEffects(); @@ -233,7 +259,7 @@ public slots: void slotDeleteTrack(int ix); /** @brief Shows the configure tracks dialog. */ void slotConfigTracks(int ix); - void clipNameChanged(const QString id, const QString name); + void clipNameChanged(const QString &id, const QString &name); void slotTrackUp(); void slotTrackDown(); void slotSelectTrack(int ix); @@ -261,13 +287,25 @@ public slots: /** @brief Add en effect to a track. * @param effect The new effect xml * @param ix The track index */ - void slotAddTrackEffect(const QDomElement effect, int ix); + void slotAddTrackEffect(const QDomElement &effect, int ix); + /** @brief Select all clips in selected track. */ + void slotSelectClipsInTrack(); + /** @brief Select all clips in timeline. */ + void slotSelectAllClips(); /** @brief Update the list of snap points (sticky timeline hotspots). * @param selected The currently selected clip if any * @param offsetList The list of points that should also snap (for example when movin a clip, start and end points should snap * @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 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); @@ -283,6 +321,7 @@ protected: virtual Qt::DropActions supportedDropActions() const; private: + int m_ct; int m_tracksHeight; int m_projectDuration; int m_cursorPos; @@ -310,6 +349,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); @@ -351,6 +391,9 @@ private: 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; @@ -358,7 +401,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); - bool insertDropClips(const QMimeData *data, const QPoint pos); + bool insertDropClips(const QMimeData *data, const QPoint &pos); bool canBePastedTo(QList infoList, int type) const; bool canBePasted(QList items, GenTime offset, int trackOffset) const; bool canBeMoved(QList items, GenTime offset, int trackOffset) const; @@ -411,12 +454,7 @@ private: void razorGroup(AbstractGroupItem *group, GenTime cutPos); /** @brief Gets the effect parameters that will be passed to Mlt. */ - EffectsParameterList getEffectArgs(const QDomElement effect); - - /** @brief Updates @param item's pan and zoom effect after resize or cut. - * @param item clip whose pan and zoom effect should be updated - * @param cutPos (optional) if clip was cut, cut position relative to the original's clip position */ - void updatePanZoom(ClipItem *item, GenTime cutPos = GenTime()); + EffectsParameterList getEffectArgs(const QDomElement &effect); /** @brief Update Tracknames to fit again after track was added/deleted. * @param track Number of track which was added/deleted @@ -439,6 +477,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(); @@ -455,6 +496,9 @@ private slots: * @param id The clip's Id string. * @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, QStringList extra); + signals: void cursorMoved(int, int); @@ -463,17 +507,17 @@ 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(); void tracksChanged(); - void displayMessage(const QString, MessageType); - void showClipFrame(DocClipBase *, QPoint, const int); + void displayMessage(const QString &, MessageType); + 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.*/ @@ -482,6 +526,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&); }; #endif