331 fixed: Naming of tracks now Audio 1, Video 1, etc. http://www.kdenlive.org/mantis...

[kdenlive] / src / transitionsettings.h

diff --git a/src/transitionsettings.h b/src/transitionsettings.h
index a06e6197492b512dd36d86cc45ad6ea081dbdc53..3166a01c5e29484e6d5eb825c1071d4317e53de7 100644 (file)
--- a/src/transitionsettings.h
+++ b/src/transitionsettings.h
@@ -27,25 +27,35 @@ 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);
+    void updateProjectFormat(MltVideoProfile profile, Timecode t, const QList <TrackInfo> info);
+    void updateTimecodeFormat();
 
 private:
-    Ui::TransitionSettings_UI ui;
-    EffectStackEdit *effectEdit;
+    EffectStackEdit *m_effectEdit;
     Transition* m_usedTransition;
     GenTime m_transitionDuration;
     GenTime m_transitionStart;
+    int m_autoTrackTransition;
+    QList <TrackInfo> m_tracks;
+    void updateTrackList();
 
 public slots:
-    void slotTransitionItemSelected(Transition*);
-    void slotTransitionChanged(bool reinit = true);
+    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);