Fix several title clips problems, including:

[kdenlive] / src / renderer.h

diff --git a/src/renderer.h b/src/renderer.h
index 2e28eb643601079aa2c44107576da9dacbf48ded..affb77d440f82277878b197f6143a31eb5ed3d66 100644 (file)
--- a/src/renderer.h
+++ b/src/renderer.h
@@ -15,8 +15,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef KRENDER_H
-#define KRENDER_H
+#ifndef RENDERER_H
+#define RENDERER_H
 
 #include <qdom.h>
 #include <qstring.h>
@@ -31,16 +31,18 @@
 /**Render encapsulates the client side of the interface to a renderer.
 From Kdenlive's point of view, you treat the Render object as the
 renderer, and simply use it as if it was local. Calls are asyncrhonous -
-you send a call out, and then recieve the return value through the
+you send a call out, and then receive the return value through the
 relevant signal that get's emitted once the call completes.
   *@author Jason Wood
   */
 
 class Render;
-//class EffectParamDesc;
+
+class QTimer;
 class QPixmap;
 
-namespace Mlt {
+namespace Mlt
+{
 class Consumer;
 class Playlist;
 class Tractor;
@@ -53,7 +55,8 @@ class Multitrack;
 
 
 
-class Render: public QObject {
+class Render: public QObject
+{
 Q_OBJECT public:
 
     enum FailStates { OK = 0,
@@ -91,8 +94,8 @@ 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();
-    void saveSceneList(QString path, QDomElement kdenliveData = QDomElement());
+    const QString sceneList();
+    bool saveSceneList(QString path, QDomElement kdenliveData = QDomElement());
 
     /** Wraps the VEML command of the same name. Tells the renderer to
     play the current scene at the speed specified, relative to normal
@@ -140,11 +143,11 @@ Q_OBJECT public:
     /** Turn on or off on screen display */
     void refreshDisplay();
     int resetProfile();
-    const double fps() const;
-    const int renderWidth() const;
-    const int renderHeight() const;
+    double fps() const;
+    int renderWidth() const;
+    int renderHeight() const;
     /** get display aspect ratio */
-    const double dar() const;
+    double dar() const;
 
     /** Playlist manipulation */
     void mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *prod);
@@ -152,8 +155,10 @@ Q_OBJECT public:
     void mltCutClip(int track, GenTime position);
     void mltInsertSpace(QMap <int, int> trackClipStartList, QMap <int, int> trackTransitionStartList, int track, const GenTime duration, const GenTime timeOffset);
     int mltGetSpaceLength(const GenTime pos, int track, bool fromBlankStart);
+    int mltTrackDuration(int track);
     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);
@@ -236,11 +241,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();
@@ -258,6 +262,7 @@ signals:   // Signals
     void rendererPosition(int);
     void rendererStopped(int);
     void removeInvalidClip(const QString &);
+    void refreshDocumentProducers();
 
 public slots:  // Public slots
     /** Start Consumer */
@@ -272,7 +277,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);