- Avoid adding an undo command when no clips are actually added. [1]

[kdenlive] / src / renderer.h

diff --git a/src/renderer.h b/src/renderer.h
index e1cd584b94fb85dc0a2a0a579cf91c3093ba6ca1..92948354ca1c31760e0a9c3c24ff21bb596e58a3 100644 (file)
--- a/src/renderer.h
+++ b/src/renderer.h
@@ -52,7 +52,9 @@ namespace Mlt
 class Consumer;
 class Playlist;
 class Tractor;
+class Transition;
 class Frame;
+class Field;
 class Producer;
 class Filter;
 class Profile;
@@ -196,7 +198,7 @@ Q_OBJECT public:
     bool mltMoveTransition(QString type, int startTrack,  int newTrack, int newTransitionTrack, GenTime oldIn, GenTime oldOut, GenTime newIn, GenTime newOut);
     bool mltAddTransition(QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml, bool refresh = true);
     void mltDeleteTransition(QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml, bool refresh = true);
-    void mltUpdateTransition(QString oldTag, QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml);
+    void mltUpdateTransition(QString oldTag, QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml, bool force = false);
     void mltUpdateTransitionParams(QString type, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml);
     void mltAddClipTransparency(ItemInfo info, int transitiontrack, int id);
     void mltMoveTransparency(int startTime, int endTime, int startTrack, int endTrack, int id);
@@ -205,6 +207,8 @@ Q_OBJECT public:
     void mltInsertTrack(int ix, bool videoTrack);
     void mltDeleteTrack(int ix);
     bool mltUpdateClipProducer(int track, int pos, Mlt::Producer *prod);
+    void mltPlantTransition(Mlt::Field *field, Mlt::Transition &tr, int a_track, int b_track);
+    Mlt::Producer *invalidProducer(const QString &id);
 
     /** Change speed of a clip in playlist. To do this, we create a new "framebuffer" producer.
     This new producer must have its "resource" param set to: video.mpg?0.6 where video.mpg is the path
@@ -220,6 +224,7 @@ Q_OBJECT public:
 #ifdef Q_WS_MAC
     void showFrame(Mlt::Frame&);
 #endif
+    QList <int> checkTrackSequence(int);
 
 private:   // Private attributes & methods
     /** The name of this renderer - useful to identify the renderes by what they do - e.g. background rendering, workspace monitor, etc... */
@@ -292,7 +297,6 @@ signals:   // Signals
     void rendererStopped(int);
     void removeInvalidClip(const QString &, bool replaceProducer);
     void refreshDocumentProducers();
-    void blockMonitors();
     /** Used on OS X - emitted when a frame's image is to be shown. */
     void showImageSignal(QImage);
 
@@ -308,12 +312,13 @@ public slots:  // Public slots
     /** Wraps the VEML command of the same name. Requests the file properties
     for the specified url from the renderer. Upon return, the result will be emitted
     via replyGetFileProperties(). */
-    void getFileProperties(const QDomElement xml, const QString &clipId, bool replaceProducer = true);
+    void getFileProperties(const QDomElement xml, const QString &clipId, int imageHeight, bool replaceProducer = true);
 
     void exportFileToFirewire(QString srcFileName, int port, GenTime startTime, GenTime endTime);
     static char *decodedString(QString str);
     void mltSavePlaylist();
     void slotSplitView(bool doit);
+    void slotSwitchFullscreen();
 };
 
 #endif