X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fclipitem.h;h=b3b36281f43e76965ef5b3ac9926f55548e51f77;hb=9aad78d75990fd8fd7002ed8f96d095bc7174ee9;hp=c1589cd74bcff254270fcba901514518e28681d9;hpb=104b3b6ac0ccbdb94b3097c97cd01a7e31afbbbe;p=kdenlive diff --git a/src/clipitem.h b/src/clipitem.h index c1589cd7..b3b36281 100644 --- a/src/clipitem.h +++ b/src/clipitem.h @@ -36,23 +36,25 @@ class DocClipBase; class Transition; -class ClipItem : public AbstractClipItem { +class ClipItem : public AbstractClipItem +{ Q_OBJECT public: - ClipItem(DocClipBase *clip, ItemInfo info, double fps); + ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, bool generateThumbs = true); virtual ~ ClipItem(); virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *); virtual int type() const; - void resizeStart(int posx); - void resizeEnd(int posx); + void resizeStart(int posx, double speed = 1.0); + void resizeEnd(int posx, double speed = 1.0, bool updateKeyFrames = true); OPERATIONTYPE operationMode(QPointF pos); const QString &clipProducer() const; int clipType() const; DocClipBase *baseClip() const; QString clipName() const; + void setClipName(const QString &name); QDomElement xml() const; ClipItem *clone(ItemInfo info) const; const EffectsList effectList(); @@ -61,9 +63,9 @@ public: /** Give a string list of the clip's effect names */ QStringList effectNames(); /** Add an effect to the clip and return the parameters that will be passed to Mlt */ - QHash addEffect(QDomElement effect, bool animate = true); + EffectsParameterList addEffect(QDomElement effect, bool animate = true); /** Get the effect parameters that will be passed to Mlt */ - QHash getEffectArgs(QDomElement effect); + EffectsParameterList getEffectArgs(QDomElement effect); /** Delete effect with id index */ void deleteEffect(QString index); /** return the number of effects in that clip */ @@ -79,12 +81,12 @@ public: /** regenerate audio and video thumbnails */ void resetThumbs(); /** update clip properties from base clip */ - void refreshClip(); + void refreshClip(bool checkDuration); /** Returns a list of times for this clip's markers */ QList snapMarkers() const; QList commentedSnapMarkers() const; - uint fadeIn() const; - uint fadeOut() const; + int fadeIn() const; + int fadeOut() const; void setSelectedEffect(const int ix); void updateKeyframeEffect(); QDomElement selectedEffect(); @@ -96,7 +98,17 @@ public: void setSpeed(const double speed); double speed() const; GenTime maxDuration() const; + GenTime cropStart() const; + GenTime endPos() const; + GenTime cropDuration() const; int hasEffect(const QString &tag, const QString &id) const; + bool checkKeyFrames(); + QPixmap startThumb() const; + QPixmap endThumb() const; + void setVideoOnly(bool force); + void setAudioOnly(bool force); + bool isVideoOnly() const; + bool isAudioOnly() const; protected: //virtual void mouseMoveEvent(QGraphicsSceneMouseEvent * event); @@ -105,49 +117,46 @@ protected: virtual void dragEnterEvent(QGraphicsSceneDragDropEvent *event); virtual void dragLeaveEvent(QGraphicsSceneDragDropEvent *event); virtual void dropEvent(QGraphicsSceneDragDropEvent *event); - virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *); - virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *); + //virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *); + //virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *); virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value); private: DocClipBase *m_clip; OPERATIONTYPE m_resizeMode; - int m_grabPoint; QString m_producer; CLIPTYPE m_clipType; QString m_clipName; QString m_effectNames; - uint m_startFade; - uint m_endFade; - int m_maxTrack; + int m_startFade; + int m_endFade; + bool m_audioOnly; + bool m_videoOnly; QPixmap m_startPix; QPixmap m_endPix; bool m_hasThumbs; - QTimer *startThumbTimer; - QTimer *endThumbTimer; + QTimer *m_startThumbTimer; + QTimer *m_endThumbTimer; - /** counter used to provide a unique id to each effect */ - int m_effectsCounter; int m_selectedEffect; - double m_opacity; QTimeLine *m_timeLine; bool m_startThumbRequested; bool m_endThumbRequested; - bool m_hover; + //bool m_hover; double m_speed; EffectsList m_effectList; QList m_transitionsList; - QMap audioThumbCachePic; - bool audioThumbWasDrawn, audioThumbReady; - double framePixelWidth; - QMap channelPaths; + QMap m_audioThumbCachePic; + bool m_audioThumbReady; + double m_framePixelWidth; /** Called when clip start is resized, adjust keyframes values */ void checkEffectsKeyframesPos(const int previous, const int current, bool fromStart); + QPixmap m_videoPix; + QPixmap m_audioPix; private slots: - void slotFetchThumbs(); void slotGetStartThumb(); void slotGetEndThumb(); void slotGotAudioData(); @@ -155,10 +164,13 @@ private slots: void animate(qreal value); void slotSetStartThumb(QImage img); void slotSetEndThumb(QImage img); - void slotSetStartThumb(QPixmap pix); - void slotSetEndThumb(QPixmap pix); void slotThumbReady(int frame, QPixmap pix); +public slots: + void slotFetchThumbs(); + void slotSetStartThumb(const QPixmap pix); + void slotSetEndThumb(const QPixmap pix); + signals: void getThumb(int, int); void prepareAudioThumb(double, int, int, int);