X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomtrackview.h;h=0df31b42816866a99f5f32ba566e4af022712d99;hb=8e0df3266e38baf1884404e8baf31ea866c9dce0;hp=c5c62f9a0624b3fbb6c6403cb71ea31e52027abb;hpb=a1f0a54b93ab364a37fd8242c1881c61d066ada7;p=kdenlive diff --git a/src/customtrackview.h b/src/customtrackview.h index c5c62f9a..0df31b42 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 { @@ -60,7 +61,13 @@ public: void configTracks(QList trackInfos); int cursorPos(); void checkAutoScroll(); - void moveClip(const ItemInfo &start, const ItemInfo &end, bool refresh); + /** + 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); @@ -76,8 +83,10 @@ public: void slotAddGroupEffect(QDomElement effect, AbstractGroupItem *group); 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); @@ -138,6 +147,12 @@ public: /** @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 @@ -174,7 +189,7 @@ 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; /** update the timeline objects when palette changes */ @@ -192,9 +207,9 @@ public slots: 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); @@ -272,6 +287,8 @@ public slots: * @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); protected: virtual void drawBackground(QPainter * painter, const QRectF & rect); @@ -315,6 +332,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); @@ -356,6 +374,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; @@ -439,6 +460,12 @@ 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, QUndoCommand *effectCommand); + + /** @brief Get effect parameters ready for MLT*/ + void adjustEffectParameters(EffectsParameterList ¶meters, QDomNodeList params, const QString &prefix = QString()); private slots: void slotRefreshGuides(); @@ -466,9 +493,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();