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 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 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, bool refreshEffectStack = false);
void updateSceneFrameWidth();
//QList <TrackInfo> tracksList() const;
void setTool(PROJECTTOOL tool);
- ClipItem *cutClip(ItemInfo info, GenTime cutTime, bool cut, bool execute = true);
+ ClipItem *cutClip(ItemInfo info, GenTime cutTime, bool cut, EffectsList oldStack = EffectsList(), bool execute = true);
void slotSeekToPreviousSnap();
void slotSeekToNextSnap();
double getSnapPointForPos(double pos);
*
* 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);
int getFrameWidth();
/** @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 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 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 */
void updateSnapPoints(AbstractClipItem *selected, QList <GenTime> offsetList = QList <GenTime> (), 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);
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;
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) */
/** @brief Prepare an add clip command for an effect */
void processEffect(ClipItem *item, QDomElement effect, int offset, QUndoCommand *effectCommand);
-
- /** @brief Get effect parameters ready for MLT*/
- void adjustEffectParameters(EffectsParameterList ¶meters, QDomNodeList params, const QString &prefix = QString());
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 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 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