Try to fix audio mixing bug ( http://www.kdenlive.org:80/mantis/view.php?id=228 )

[kdenlive] / src / docclipbase.h

diff --git a/src/docclipbase.h b/src/docclipbase.h
index 230b3d4baa398b52e0ed46b3e005f3b974fbbc2f..cc427b0d96076ae230b92454fce6d55568516b5d 100644 (file)
--- a/src/docclipbase.h
+++ b/src/docclipbase.h
@@ -28,7 +28,6 @@
 #include <QTimer>
 
 #include <KUrl>
-#include <klocale.h>
 
 #include "gentime.h"
 #include "definitions.h"
@@ -43,24 +42,8 @@ class KdenliveDoc;
 class KThumb;
 class ClipManager;
 
-class CommentedTime {
-public:
-    CommentedTime(): t(GenTime(0)) {}
-    CommentedTime(const GenTime time, QString comment)
-            : t(time), c(comment) { }
-
-    QString comment()   const          {
-        return (c.isEmpty() ? i18n("Marker") : c);
-    }
-    GenTime time() const          {
-        return t;
-    }
-    void    setComment(QString comm) {
-        c = comm;
-    }
-private:
-    GenTime t;
-    QString c;
+namespace Mlt {
+class Producer;
 };
 
 
@@ -71,9 +54,8 @@ Q_OBJECT public:
      *   done here. If a new clip type is added then it should be possible to combine it with both audio
      *   and video. */
 
-    DocClipBase(ClipManager *clipManager, QDomElement xml, uint id);
-    DocClipBase(const DocClipBase& clip);
-    DocClipBase & operator=(const DocClipBase & clip);
+    DocClipBase(ClipManager *clipManager, QDomElement xml, const QString &id);
+//    DocClipBase & operator=(const DocClipBase & clip);
     virtual ~ DocClipBase();
 
     /** sets the name of this clip. */
@@ -84,16 +66,25 @@ Q_OBJECT public:
 
     /** Returns the description of this clip. */
     const QString description() const;
+    /** Does this clip need a transparent background (e.g. for titles). */
+    bool isTransparent() const;
+
+    /** Returns any property of this clip. */
+    const QString getProperty(const QString prop) const;
+    void setProperty(const QString &key, const QString &value);
+    void clearProperty(const QString &key);
 
     /** Returns the internal unique id of the clip. */
-    uint getId() const;
-    void setId(const uint &newId);
+    const QString &getId() const;
+    void setId(const QString &newId);
 
     //KThumb *thumbCreator;
     bool audioThumbCreated() const;
+    /*void getClipMainThumb();*/
 
     /** returns the duration of this clip */
     const GenTime & duration() const;
+    const GenTime &maxDuration() const;
     /** returns the duration of this clip */
     void setDuration(GenTime dur);
 
@@ -119,6 +110,9 @@ Q_OBJECT public:
         return false;
     }
 
+    void setProducer(Mlt::Producer *producer);
+    Mlt::Producer *producer(int track = -1);
+
     /*virtual DocClipAVFile *toDocClipAVFile() {
     return 0;
     }
@@ -154,7 +148,6 @@ Q_OBJECT public:
                             const GenTime & endTime) const;
     /** returns a QString containing all of the XML data required to recreate this clip. */
     QDomElement toXML() const;
-    QDomDocument generateSceneList(bool addProducers = true, bool rendering = false) const;
 
     /** Returns true if the xml passed matches the values in this clip */
     bool matchesXML(const QDomElement & element) const;
@@ -192,10 +185,9 @@ Q_OBJECT public:
     /** format is frame -> channel ->bytes */
     QMap<int, QMap<int, QByteArray> > audioFrameChache;
 
-    /** Clip is ready to get thumbs */
-    void slotRequestAudioThumbs();
     /** Free cache data */
     void slotClearAudioCache();
+    void askForAudioThumbs();
 
 private:   // Private attributes
     /** The name of this clip */
@@ -205,7 +197,7 @@ private:   // Private attributes
     /** The number of times this clip is used in the project - the number of references to this clip
      * that exist. */
     uint m_refcount;
-
+    QList <Mlt::Producer *> m_baseTrackProducers;
     CLIPTYPE m_clipType;
 
     /** A list of snap markers; these markers are added to a clips snap-to points, and are displayed as necessary. */
@@ -220,17 +212,19 @@ private:   // Private attributes
     bool m_audioThumbCreated;
 
     /** a unique numeric id */
-    uint m_id;
-    uint m_projectThumbFrame;
+    QString m_id;
     void setAudioThumbCreated(bool isDone);
     /** Holds clip infos like fps, size,... */
     QMap <QString, QString> m_properties;
     /** Create connections for audio thumbnails */
     void slotCreateAudioTimer();
+    void slotRefreshProducer();
+    void setProducerProperty(const char *name, const char *data);
+    void setProducerProperty(const char *name, int data);
 
 public slots:
     void updateAudioThumbnail(QMap<int, QMap<int, QByteArray> > data);
-    void slotGetAudioThumbs();
+    bool slotGetAudioThumbs();
     QList < CommentedTime > commentedSnapMarkers() const;
     void setSnapMarkers(QList < CommentedTime > markers);
     GenTime findNextSnapMarker(const GenTime & currTime);
@@ -241,8 +235,8 @@ public slots:
     void addSnapMarker(const GenTime & time, QString comment);
     QList < GenTime > snapMarkers() const;
     QString markerComment(GenTime t);
-    void setProjectThumbFrame(const uint &ix);
-    uint getProjectThumbFrame() const;
+    void setClipThumbFrame(const uint &ix);
+    uint getClipThumbFrame() const;
     void setProperties(QMap <QString, QString> properties);
     QMap <QString, QString> properties() const;