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 63acdc16ee01efb7bb0e71f15819b18fe7a12f66..9436033d97d919ce33baf95144f0d5c6f3b5f57c 100644 (file)
--- a/src/clipitem.h
+++ b/src/clipitem.h
@@ -81,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();
@@ -124,25 +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;
@@ -151,10 +148,9 @@ 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;