X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fclipitem.h;h=9436033d97d919ce33baf95144f0d5c6f3b5f57c;hb=9f76a9103088feb8ae3feef0343ddfdcf0685fe6;hp=f21d049eec761fe07a5f24b7a51d49b19e649aea;hpb=9c59a265a6ded9306fa7afa13b18c96e25d45f77;p=kdenlive

diff --git a/src/clipitem.h b/src/clipitem.h
index f21d049e..9436033d 100644
--- a/src/clipitem.h
+++ b/src/clipitem.h
@@ -21,10 +21,11 @@
 #ifndef CLIPITEM_H
 #define CLIPITEM_H
 
+#include <QTimeLine>
 #include <QGraphicsRectItem>
 #include <QDomElement>
 #include <QGraphicsSceneMouseEvent>
-#include <QTimeLine>
+#include <QTimer>
 
 #include "definitions.h"
 #include "gentime.h"
@@ -34,34 +35,37 @@
 class DocClipBase;
 class Transition;
 
-class ClipItem : public AbstractClipItem {
+
+class ClipItem : public AbstractClipItem
+{
     Q_OBJECT
 
 public:
-    ClipItem(DocClipBase *clip, ItemInfo info, double scale, 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, double scale);
-    void resizeEnd(int posx, double scale);
-    OPERATIONTYPE operationMode(QPointF pos, double scale);
-    int clipProducer() const;
+    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(double scale, ItemInfo info) const;
+    ClipItem *clone(ItemInfo info) const;
     const EffectsList effectList();
-    void setFadeOut(int pos, double scale);
-    void setFadeIn(int pos, double scale);
+    void setFadeOut(int pos);
+    void setFadeIn(int pos);
     /** 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 */
-    QMap <QString, QString> addEffect(QDomElement effect, bool animate = true);
+    EffectsParameterList addEffect(QDomElement effect, bool animate = true);
     /** Get the effect parameters that will be passed to Mlt */
-    QMap <QString, QString> getEffectArgs(QDomElement effect);
+    EffectsParameterList getEffectArgs(QDomElement effect);
     /** Delete effect with id index */
     void deleteEffect(QString index);
     /** return the number of effects in that clip */
@@ -77,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 <GenTime> snapMarkers() const;
     QList <CommentedTime> commentedSnapMarkers() const;
-    uint fadeIn() const;
-    uint fadeOut() const;
+    int fadeIn() const;
+    int fadeOut() const;
     void setSelectedEffect(const int ix);
     void updateKeyframeEffect();
     QDomElement selectedEffect();
@@ -94,6 +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);
@@ -104,56 +119,61 @@ protected:
     virtual void dropEvent(QGraphicsSceneDragDropEvent *event);
     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;
-    int m_producer;
+    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;
-    uint m_thumbsRequested;
+    bool m_startThumbRequested;
+    bool m_endThumbRequested;
     bool m_hover;
     double m_speed;
 
     EffectsList m_effectList;
     QList <Transition*> m_transitionsList;
-    QMap<int, QPixmap> audioThumbCachePic;
-    bool audioThumbWasDrawn, audioThumbReady;
-    double framePixelWidth;
-    QMap<int, QPainterPath > channelPaths;
+    QMap<int, QPixmap> 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 slotThumbReady(int frame, QPixmap pix);
     void slotFetchThumbs();
     void slotGetStartThumb();
     void slotGetEndThumb();
     void slotGotAudioData();
-    void slotPrepareAudioThumb(double pixelForOneFrame, QPainterPath path, int startpixel, int endpixel, int channels);
+    void slotPrepareAudioThumb(double pixelForOneFrame, int startpixel, int endpixel, int channels);
     void animate(qreal value);
+    void slotSetStartThumb(QImage img);
+    void slotSetEndThumb(QImage img);
+    void slotThumbReady(int frame, QPixmap pix);
+
+public slots:
+    void slotSetStartThumb(const QPixmap pix);
+    void slotSetEndThumb(const QPixmap pix);
 
 signals:
     void getThumb(int, int);
-    void prepareAudioThumb(double, QPainterPath, int, int, int);
+    void prepareAudioThumb(double, int, int, int);
 };
 
 #endif