cleanup & fix crash on project saving with Qt 4.5:

[kdenlive] / src / renderer.h

diff --git a/src/renderer.h b/src/renderer.h
index 98b109c259f38e02ee4de57d10a5292a967cde62..eafd05a076e3b9f2cb8a8af6e1a6e60876392d97 100644 (file)
--- a/src/renderer.h
+++ b/src/renderer.h
@@ -91,7 +91,7 @@ Q_OBJECT public:
     void setSceneList(QDomDocument list, int position = 0);
     void setSceneList(QString playlist, int position = 0);
     void setProducer(Mlt::Producer *producer, int position);
-    QString sceneList();
+    const QString sceneList();
     void saveSceneList(QString path, QDomElement kdenliveData = QDomElement());
 
     /** Wraps the VEML command of the same name. Tells the renderer to
@@ -154,16 +154,17 @@ Q_OBJECT public:
     int mltGetSpaceLength(const GenTime pos, int track, bool fromBlankStart);
     bool mltResizeClipEnd(ItemInfo info, GenTime clipDuration);
     bool mltResizeClipStart(ItemInfo info, GenTime diff);
+    bool mltResizeClipCrop(ItemInfo info, GenTime diff);
     bool mltMoveClip(int startTrack, int endTrack, GenTime pos, GenTime moveStart, Mlt::Producer *prod);
     bool mltMoveClip(int startTrack, int endTrack, int pos, int moveStart, Mlt::Producer *prod);
     bool mltRemoveClip(int track, GenTime position);
-    bool mltRemoveEffect(int track, GenTime position, QString index, bool doRefresh = true);
+    bool mltRemoveEffect(int track, GenTime position, QString index, bool updateIndex, bool doRefresh = true);
     bool mltAddEffect(int track, GenTime position, EffectsParameterList params, bool doRefresh = true);
     bool mltEditEffect(int track, GenTime position, EffectsParameterList params);
     void mltMoveEffect(int track, GenTime position, int oldPos, int newPos);
     void mltChangeTrackState(int track, bool mute, bool blind);
-    void mltMoveTransition(QString type, int startTrack,  int newTrack, int newTransitionTrack, GenTime oldIn, GenTime oldOut, GenTime newIn, GenTime newOut);
-    void mltAddTransition(QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml, bool refresh = true);
+    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 mltUpdateTransitionParams(QString type, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml);
@@ -183,6 +184,7 @@ Q_OBJECT public:
     int mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, Mlt::Producer *prod);
 
     QList <Mlt::Producer *> producersList();
+    void updatePreviewSettings();
 
 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... */
@@ -199,6 +201,7 @@ private:   // Private attributes & methods
     bool m_isZoneMode;
     bool m_isLoopMode;
     GenTime m_loopStart;
+    int m_originalOut;
 
     /** true when monitor is in split view (several tracks at the same time) */
     bool m_isSplitView;
@@ -206,6 +209,7 @@ private:   // Private attributes & methods
     Mlt::Producer *m_blackClip;
     /** Holds the path to on screen display profile */
     QString m_osdProfile;
+    QString m_activeProfile;
 
     QTimer *refreshTimer;
     QTimer *osdTimer;
@@ -222,6 +226,7 @@ private:   // Private attributes & methods
     QMap<QString, Mlt::Producer *> m_slowmotionProducers;
     void buildConsumer();
     void resetZoneMode();
+    void fillSlowMotionProducers();
 
 private slots:  // Private slots
     /** refresh monitor display */
@@ -232,11 +237,10 @@ private slots:  // Private slots
 
 signals:   // Signals
     /** emitted when the renderer recieves a reply to a getFileProperties request. */
-    void replyGetFileProperties(const QString &clipId, Mlt::Producer*, const QMap < QString, QString > &, const QMap < QString, QString > &);
+    void replyGetFileProperties(const QString &clipId, Mlt::Producer*, const QMap < QString, QString > &, const QMap < QString, QString > &, bool);
 
     /** emitted when the renderer recieves a reply to a getImage request. */
-    void replyGetImage(const QString & , int, const QPixmap &, int, int);
-    void replyGetImage(const QString &, const QPixmap &, int, int);
+    void replyGetImage(const QString &, const QPixmap &);
 
     /** Emitted when the renderer stops, either playing or rendering. */
     void stopped();
@@ -268,7 +272,7 @@ 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);
+    void getFileProperties(const QDomElement &xml, const QString &clipId, bool replaceProducer = true);
 
     void exportFileToFirewire(QString srcFileName, int port, GenTime startTime, GenTime endTime);
     static char *decodedString(QString str);