X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftransitionsettings.h;h=998045057d25eaeba706cd36e18965ac269c3de6;hb=e7dcc38423c07ce3f0538263e809da00bb849ff5;hp=2d6be8bf58fac0b34f4dbb1113416d4223a83e5d;hpb=e1984120c805806cba78941ec08839285c3b2591;p=kdenlive

diff --git a/src/transitionsettings.h b/src/transitionsettings.h
index 2d6be8bf..99804505 100644
--- a/src/transitionsettings.h
+++ b/src/transitionsettings.h
@@ -27,34 +27,37 @@ class Transition;
 class EffectsList;
 class EffectStackEdit;
 
-class TransitionSettings : public QWidget
+class TransitionSettings : public QWidget, public Ui::TransitionSettings_UI
 {
     Q_OBJECT
 
 public:
     TransitionSettings(QWidget* parent = 0);
     void raiseWindow(QWidget*);
-    void updateProjectFormat(MltVideoProfile profile, Timecode t, const uint tracksCount);
+    void updateProjectFormat(MltVideoProfile profile, Timecode t, const QList <TrackInfo> info);
+    void updateTimecodeFormat();
 
 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*, QPoint, bool);
+    void slotTransitionItemSelected(Transition* t, int nextTrack, QPoint p, bool update);
     void slotTransitionChanged(bool reinit = true, bool updateCurrent = false);
     void slotUpdateEffectParams(const QDomElement&, const QDomElement&);
 
 private slots:
+
+    /** @brief Sets the new B track for the transition (automatic or forced). */
     void slotTransitionTrackChanged();
 
 signals:
     void transitionUpdated(Transition *, QDomElement);
-    void transferParamDesc(const QDomElement&, int , int);
     void seekTimeline(int);
 };