X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fclipitem.h;h=98bd1c010df6760dc38ccd132b0b686407d31098;hb=d0a7184b48382bbffa1fdef032932a31d5bc6217;hp=190c669b1749116df26e55c1bd21059605f7401a;hpb=f718b68bc9b5d25fd864b0281d9406cdc92e88ca;p=kdenlive

diff --git a/src/clipitem.h b/src/clipitem.h
index 190c669b..98bd1c01 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,33 +35,35 @@
 class DocClipBase;
 class Transition;
 
+
 class ClipItem : public AbstractClipItem {
     Q_OBJECT
 
 public:
-    ClipItem(DocClipBase *clip, ItemInfo info, GenTime cropStart, double scale, double fps);
+    ClipItem(DocClipBase *clip, ItemInfo info, double fps, 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;
     QDomElement xml() const;
-
-    void setFadeOut(int pos, double scale);
-    void setFadeIn(int pos, double scale);
+    ClipItem *clone(ItemInfo info) const;
+    const EffectsList effectList();
+    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);
+    QHash <QString, QString> addEffect(QDomElement effect, bool animate = true);
     /** Get the effect parameters that will be passed to Mlt */
-    QMap <QString, QString> getEffectArgs(QDomElement effect);
+    QHash <QString, QString> getEffectArgs(QDomElement effect);
     /** Delete effect with id index */
     void deleteEffect(QString index);
     /** return the number of effects in that clip */
@@ -79,6 +82,7 @@ public:
     void refreshClip();
     /** Returns a list of times for this clip's markers */
     QList <GenTime> snapMarkers() const;
+    QList <CommentedTime> commentedSnapMarkers() const;
     uint fadeIn() const;
     uint fadeOut() const;
     void setSelectedEffect(const int ix);
@@ -88,6 +92,17 @@ public:
     void initEffect(QDomElement effect);
     QString keyframes(const int index);
     void setKeyframes(const int ix, const QString keyframes);
+    void setEffectList(const EffectsList effectList);
+    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;
 
 protected:
     //virtual void mouseMoveEvent(QGraphicsSceneMouseEvent * event);
@@ -98,18 +113,18 @@ 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;
 
     QPixmap m_startPix;
@@ -118,13 +133,13 @@ private:
     QTimer *startThumbTimer;
     QTimer *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;
@@ -134,19 +149,25 @@ private:
     QMap<int, QPainterPath > channelPaths;
     /** Called when clip start is resized, adjust keyframes values */
     void checkEffectsKeyframesPos(const int previous, const int current, bool fromStart);
+
 private slots:
-    void slotThumbReady(int frame, QPixmap pix);
     void slotFetchThumbs();
     void slotGetStartThumb();
     void slotGetEndThumb();
     void slotGotAudioData();
-    void slotPrepareAudioThumb(double, QPainterPath, int, int);
+    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);
-
+    void prepareAudioThumb(double, int, int, int);
 };
 
 #endif