Merge branch 'master' of git://anongit.kde.org/kdenlive

[kdenlive] / src / transitionsettings.h

diff --git a/src/transitionsettings.h b/src/transitionsettings.h
index 62b8445a6a1a355701f6fc24d83d1913675db0cc..356a74deb42dc8057470f517627081c1487091c2 100644 (file)
--- a/src/transitionsettings.h
+++ b/src/transitionsettings.h
@@ -26,13 +26,14 @@ class Timecode;
 class Transition;
 class EffectsList;
 class EffectStackEdit;
+class Monitor;
 
 class TransitionSettings : public QWidget, public Ui::TransitionSettings_UI
 {
     Q_OBJECT
 
 public:
-    TransitionSettings(QWidget* parent = 0);
+    TransitionSettings(Monitor *monitor, QWidget* parent = 0);
     void raiseWindow(QWidget*);
     void updateProjectFormat(MltVideoProfile profile, Timecode t, const QList <TrackInfo> info);
     void updateTimecodeFormat();
@@ -52,9 +53,10 @@ public slots:
     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);
 
 signals:
     void transitionUpdated(Transition *, QDomElement);