Don't crash when wrong sdl driver was selected by user (needs MLT patch):

[kdenlive] / src / renderer.h

diff --git a/src/renderer.h b/src/renderer.h
index 5943e0ae98e8d34751ace94a82be4f754b841d50..04d632220cd99023c9ea4dc2c842dfb11bf07caf 100644 (file)
--- a/src/renderer.h
+++ b/src/renderer.h
@@ -50,7 +50,7 @@ class Frame;
 class Producer;
 class Filter;
 class Profile;
-class Multitrack;
+class Service;
 };
 
 
@@ -69,7 +69,7 @@ Q_OBJECT public:
     /** Seeks the renderer clip to the given time. */
     void seek(GenTime time);
     void seekToFrame(int pos);
-    bool m_isBlocked;
+    int m_isBlocked;
 
     //static QPixmap getVideoThumbnail(char *profile, QString file, int frame, int width, int height);
     QPixmap getImageThumbnail(KUrl url, int width, int height);
@@ -91,9 +91,9 @@ Q_OBJECT public:
 
     /** Wraps the VEML command of the same name. Sets the current scene list to
     be list. */
-    void setSceneList(QDomDocument list, int position = 0);
-    void setSceneList(QString playlist, int position = 0);
-    void setProducer(Mlt::Producer *producer, int position);
+    int setSceneList(QDomDocument list, int position = 0);
+    int setSceneList(QString playlist, int position = 0);
+    int setProducer(Mlt::Producer *producer, int position);
     const QString sceneList();
     bool saveSceneList(QString path, QDomElement kdenliveData = QDomElement());
 
@@ -189,6 +189,7 @@ Q_OBJECT public:
 
     QList <Mlt::Producer *> producersList();
     void updatePreviewSettings();
+    void setDropFrames(bool show);
 
 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... */
@@ -220,6 +221,7 @@ private:   // Private attributes & methods
     /** Sets the description of this renderer to desc. */
     void closeMlt();
     void mltCheckLength();
+    void mltPasteEffects(Mlt::Producer *source, Mlt::Producer *dest);
     QMap<QString, QString> mltGetTransitionParamsFromXml(QDomElement xml);
     QMap<QString, Mlt::Producer *> m_slowmotionProducers;
     void buildConsumer();
@@ -230,7 +232,7 @@ private slots:  // Private slots
     /** refresh monitor display */
     void refresh();
     void slotOsdTimeout();
-    void connectPlaylist();
+    int connectPlaylist();
     //void initSceneList();
 
 signals:   // Signals
@@ -255,8 +257,9 @@ signals:   // Signals
     void durationChanged(int);
     void rendererPosition(int);
     void rendererStopped(int);
-    void removeInvalidClip(const QString &);
+    void removeInvalidClip(const QString &, bool replaceProducer);
     void refreshDocumentProducers();
+    void blockMonitors();
 
 public slots:  // Public slots
     /** Start Consumer */