Fix audio mixing corrupted when last audio track is muted:

[kdenlive] / src / renderer.h

diff --git a/src/renderer.h b/src/renderer.h
index c3c2959b216206c87016b2b7081e54e48131501f..86b0b928e0167a48860e5308cf13d46037c7c713 100644 (file)
--- a/src/renderer.h
+++ b/src/renderer.h
@@ -91,6 +91,7 @@ Q_OBJECT public:
 
     /** @brief Seeks the renderer clip to the given time. */
     void seek(GenTime time);
+    void seek(int time);
     void seekToFrame(int pos);
     void seekToFrameDiff(int diff);
     int m_isBlocked;
@@ -178,6 +179,8 @@ Q_OBJECT public:
 
     /** @brief Returns display aspect ratio. */
     double dar() const;
+    /** @brief Returns sample aspect ratio. */
+    double sar() const;
 
     /*
      * Playlist manipulation.
@@ -308,6 +311,12 @@ private:
     void buildConsumer(const QString profileName);
     void resetZoneMode();
     void fillSlowMotionProducers();
+    /** @brief Get the track number of the lowest audible (non muted) audio track
+     *  @param return The track number */
+    int getLowestNonMutedAudioTrack(Mlt::Tractor tractor);
+
+    /** @brief Make sure our audio mixing transitions are applied to the lowest track */
+    void fixAudioMixing(Mlt::Tractor tractor);
 
 private slots:
 
@@ -347,7 +356,10 @@ signals:
     void durationChanged(int);
     void rendererPosition(int);
     void rendererStopped(int);
+    /** @brief The clip is not valid, should be removed from project. */
     void removeInvalidClip(const QString &, bool replaceProducer);
+    /** @brief The proxy is not valid, should be deleted. */
+    void removeInvalidProxy(const QString &);
     void refreshDocumentProducers();
 
     /** @brief A frame's image has to be shown.