X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomtrackview.h;h=fdfdc798c0053c119a600510d54228d4672e2c48;hb=5cd08771831888003c9e27ec60ea7971721ff58a;hp=7ee271d300a8eb247f0636df2689c9ca714c9f32;hpb=a257df4100056533a39b5a742b0e667f2bebb51c;p=kdenlive diff --git a/src/customtrackview.h b/src/customtrackview.h index 7ee271d3..fdfdc798 100644 --- a/src/customtrackview.h +++ b/src/customtrackview.h @@ -28,6 +28,8 @@ #include #include #include +#include +#include #include "kdenlivedoc.h" #include "docclipbase.h" @@ -82,6 +84,7 @@ public: void activateMonitor(); int duration() const; void deleteSelectedClips(); + /** @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(); @@ -124,9 +127,10 @@ public: /** @brief Locks or unlocks a track. * @param ix number of track * @param lock whether to lock or unlock + * @param requestUpdate (default = true) Whether to request an update of the icon in the track header * * Makes sure no clip on track to lock is selected. */ - void lockTrack(int ix, bool lock); + 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); @@ -174,15 +178,20 @@ public: KPixmapCache* pixmapCache; /** update the timeline objects when palette changes */ void updatePalette(); + /** @brief Returns true if a track has audio data on it. + * @param track The track number + * + * Check whether given track has a clip with audio in it. */ + bool hasAudio(int track) const; public slots: void setCursorPos(int pos, bool seek = true); void moveCursorPos(int delta); void updateCursorPos(); - void slotDeleteEffect(ClipItem *clip, QDomElement effect, bool affectGroup = true); - void slotChangeEffectState(ClipItem *clip, int effectPos, bool disable); - void slotChangeEffectPosition(ClipItem *clip, int currentPos, int newPos); - void slotUpdateClipEffect(ClipItem *clip, QDomElement oldeffect, QDomElement effect, int ix); + 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 slotUpdateClipRegion(ClipItem *clip, int ix, QString region); void slotRefreshEffects(ClipItem *clip); void setDuration(int duration); @@ -219,6 +228,30 @@ public slots: void slotSelectTrack(int ix); void insertZoneOverwrite(QStringList data, int in); + /** @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); + /** @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 */ + void slotAddTrackEffect(const QDomElement effect, int ix); + protected: virtual void drawBackground(QPainter * painter, const QRectF & rect); //virtual void drawForeground ( QPainter * painter, const QRectF & rect ); @@ -297,6 +330,13 @@ private: int m_selectedTrack; int m_spacerOffset; + QMutex m_mutex; + QWaitCondition m_producerNotReady; + + /** 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); @@ -307,8 +347,6 @@ private: bool canBeMoved(QList items, GenTime offset, int trackOffset) const; ClipItem *getClipUnderCursor() const; AbstractClipItem *getMainActiveClip() const; - /** @brief Rebuilds @param group to fit changes to it's childen. */ - void rebuildGroup(AbstractGroupItem *group); void resetSelectionGroup(bool selectItems = true); void groupSelectedItems(bool force = false, bool createNewGroup = false); /** Get available space for clip move (min and max free positions) */ @@ -325,7 +363,7 @@ private: void adjustTimelineTransitions(EDITMODE mode, Transition *item, QUndoCommand *command); /** Adjust keyframes when pasted to another clip */ void adjustKeyfames(GenTime oldstart, GenTime newstart, GenTime duration, QDomElement xml); - + /** @brief Removes the tip and stops the animation timer. */ void removeTipAnimation(); /** @brief Creates a new tip animation. @@ -338,15 +376,32 @@ private: * @param item Item to resize * @param oldInfo The item's info before resizement (set to item->info() is @param check true) * @param pos New startPos - * @param check (optional, default = false) Whether to check for collisions */ - void prepareResizeClipStart(AbstractClipItem *item, ItemInfo oldInfo, int pos, bool check = false); + * @param check (optional, default = false) Whether to check for collisions + * @param command (optional) Will be used as parent command (for undo history) */ + void prepareResizeClipStart(AbstractClipItem *item, ItemInfo oldInfo, int pos, bool check = false, QUndoCommand *command = NULL); /** @brief Takes care of updating effects and attached transitions during a resize from end. * @param item Item to resize * @param oldInfo The item's info before resizement (set to item->info() is @param check true) * @param pos New endPos - * @param check (optional, default = false) Whether to check for collisions */ - void prepareResizeClipEnd(AbstractClipItem *item, ItemInfo oldInfo, int pos, bool check = false); + * @param check (optional, default = false) Whether to check for collisions + * @param command (optional) Will be used as parent command (for undo history) */ + void prepareResizeClipEnd(AbstractClipItem *item, ItemInfo oldInfo, int pos, bool check = false, QUndoCommand *command = NULL); + + /** @brief Collects information about the group's children to pass it on to RazorGroupCommand. + * @param group The group to cut + * @param cutPos The absolute position of the cut */ + 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()); private slots: void slotRefreshGuides(); @@ -376,6 +431,12 @@ signals: void updateClipMarkers(DocClipBase *); void updateTrackHeaders(); void playMonitor(); + /** @brief Monitor document changes (for example the presence of audio data in timeline for export widget.*/ + void documentModified(); + void forceClipProcessing(const QString &); + void showTrackEffects(int, TrackInfo); + /** @brief Update the track effect button that shows if a track has effects or not.*/ + void updateTrackEffectState(int); }; #endif