X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftransitionsettings.h;h=4d08933644f488f86b555c6a11b517daea07c60c;hb=6f98c44def0beef90913ef4f062f539aa7bb1743;hp=0e75058c4ae6adbed4a1826cdac93960fef56b11;hpb=727438e4c233585f94c8f03e3bfd0851eb956499;p=kdenlive

diff --git a/src/transitionsettings.h b/src/transitionsettings.h
index 0e75058c..4d089336 100644
--- a/src/transitionsettings.h
+++ b/src/transitionsettings.h
@@ -27,24 +27,25 @@ 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);
 
 private:
-    Ui::TransitionSettings_UI ui;
-    EffectStackEdit *effectEdit;
+    EffectStackEdit *m_effectEdit;
     Transition* m_usedTransition;
     GenTime m_transitionDuration;
     GenTime m_transitionStart;
     int m_tracksCount;
+    int m_autoTrackTransition;
 
 public slots:
-    void slotTransitionItemSelected(Transition*, 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&);
 
@@ -53,7 +54,6 @@ private slots:
 
 signals:
     void transitionUpdated(Transition *, QDomElement);
-    void transitionTrackUpdated(Transition *, int);
     void transferParamDesc(const QDomElement&, int , int);
     void seekTimeline(int);
 };