X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftransitionsettings.h;h=0e2a676450be8d086be7de6831fa76fb5f141a28;hb=87c20d036a2c530ea66bf6f00769073476879f28;hp=a78ed10584e7ce995a2708c8e422df3f0f2a8ff1;hpb=c81ea474e3884d36d6b860775e56257dbc156f64;p=kdenlive

diff --git a/src/transitionsettings.h b/src/transitionsettings.h
index a78ed105..0e2a6764 100644
--- a/src/transitionsettings.h
+++ b/src/transitionsettings.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          effecstackedit.h  -  description
+                          transitionsettings.h  -  Transitions widget
                              -------------------
     begin                : Mar 15 2008
     copyright            : (C) 2008 by Marco Gittler
@@ -24,39 +24,46 @@
 
 class Timecode;
 class Transition;
-class EffectsList;
 class EffectStackEdit;
+class Monitor;
 
-class TransitionSettings : public QWidget
+class TransitionSettings : public QWidget, public Ui::TransitionSettings_UI
 {
     Q_OBJECT
 
 public:
-    TransitionSettings(QWidget* parent = 0);
+    explicit TransitionSettings(Monitor *monitor, QWidget* parent = 0);
     void raiseWindow(QWidget*);
-    void updateProjectFormat(MltVideoProfile profile, Timecode t, const uint tracksCount);
+    void updateProjectFormat(const MltVideoProfile &profile, const Timecode &t, const QList <TrackInfo>& info);
+    void updateTimecodeFormat();
+    void setKeyframes(const QString &data, int maximum);
 
 private:
-    Ui::TransitionSettings_UI m_ui;
     EffectStackEdit *m_effectEdit;
     Transition* m_usedTransition;
     GenTime m_transitionDuration;
     GenTime m_transitionStart;
-    int m_tracksCount;
     int m_autoTrackTransition;
+    QList <TrackInfo> m_tracks;
+    void updateTrackList();
 
 public slots:
-    void slotTransitionItemSelected(Transition* t, int nextTrack, QPoint p, bool update);
+    void slotTransitionItemSelected(Transition* t, int nextTrack, const QPoint &p, bool update);
     void slotTransitionChanged(bool reinit = true, bool updateCurrent = false);
-    void slotUpdateEffectParams(const QDomElement&, const QDomElement&);
+    void slotUpdateEffectParams(const QDomElement &, const QDomElement&);
 
 private slots:
+    /** @brief Sets the new B track for the transition (automatic or forced). */
     void slotTransitionTrackChanged();
+    /** @brief Pass position changes of the timeline cursor to the effects to keep their local timelines in sync. */
+    void slotRenderPos(int pos);
+    void slotSeekTimeline(int pos);
+    void slotCheckMonitorPosition(int renderPos);
 
 signals:
-    void transitionUpdated(Transition *, QDomElement);
-    void transferParamDesc(const QDomElement&, int , int);
+    void transitionUpdated(Transition *, const QDomElement&);
     void seekTimeline(int);
+    void importClipKeyframes(GraphicsRectItem = TransitionWidget);
 };
 
 #endif