class AbstractClipItem;
class AbstractGroupItem;
class Transition;
+class AudioCorrelation;
class CustomTrackView : public QGraphicsView
{
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 <TrackInfo> trackInfos);
- int cursorPos();
+ void configTracks(const QList<TrackInfo> &trackInfos);
+ int cursorPos() const;
void checkAutoScroll();
- void moveClip(const ItemInfo &start, const ItemInfo &end, bool refresh);
- void moveGroup(QList <ItemInfo> startClip, QList <ItemInfo> 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<ItemInfo> startClip, QList<ItemInfo> 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);
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 <int> effectIndexes, bool disable, bool updateEffectStack);
+ void moveEffect(int track, const GenTime &pos, const QList<int> &oldPos, const QList<int> &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();
void updateSceneFrameWidth();
//QList <TrackInfo> 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);
QList<ItemInfo> 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();
*
* 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);
/** @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
* 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 <int> effectIndexes, bool disable);
+ void slotChangeEffectPosition(ClipItem *clip, int track, QList <int> 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);
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 <CommentedTime> 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();
/** @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 */
* @param skipSelectedItems if true, the selected item start and end points will not be added to snap list */
void updateSnapPoints(AbstractClipItem *selected, QList <GenTime> offsetList = QList <GenTime> (), 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);
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);
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;
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 <ItemInfo> infoList, int type) const;
bool canBePasted(QList<AbstractClipItem *> items, GenTime offset, int trackOffset) const;
ClipItem *getClipUnderCursor() const;
AbstractClipItem *getMainActiveClip() const;
void resetSelectionGroup(bool selectItems = true);
- void groupSelectedItems(bool force = false, bool createNewGroup = 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) */
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<QGraphicsItem *> checkForGroups(const QRectF &rect, bool *ok);
/** Adjust clips under another one when working in overwrite mode */
* @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();
* @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:
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 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.*/
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
projects / kdenlive / blobdiff