Check & update clip length in timeline when doing a "clip reload" from project tree...

[kdenlive] / src / clipitem.h

diff --git a/src/clipitem.h b/src/clipitem.h
index 580cf3469bd5a3fe30e6a7a031b4ff98c54145c1..9436033d97d919ce33baf95144f0d5c6f3b5f57c 100644 (file)
--- a/src/clipitem.h
+++ b/src/clipitem.h
@@ -36,11 +36,12 @@ class DocClipBase;
 class Transition;
 
 
-class ClipItem : public AbstractClipItem {
+class ClipItem : public AbstractClipItem
+{
     Q_OBJECT
 
 public:
-    ClipItem(DocClipBase *clip, ItemInfo info, double fps, bool generateThumbs = true);
+    ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, bool generateThumbs = true);
     virtual ~ ClipItem();
     virtual void paint(QPainter *painter,
                        const QStyleOptionGraphicsItem *option,
@@ -53,6 +54,7 @@ public:
     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();
@@ -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 <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();
@@ -103,6 +105,10 @@ public:
     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);
@@ -118,23 +124,22 @@ protected:
 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;
 
     int m_selectedEffect;
-    double m_opacity;
     QTimeLine *m_timeLine;
     bool m_startThumbRequested;
     bool m_endThumbRequested;
@@ -143,12 +148,13 @@ private:
 
     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 slotFetchThumbs();