comparison audioio/AudioCallbackPlaySource.h @ 13:89bb89894ad6

* As previous commit

      * 0.0 -> 1.0, for metering purposes.
      */
     virtual bool getOutputLevels(float &left, float &right);
 
     /**
-     * Get the number of channels of audio that will be available.
+     * Get the number of channels of audio that in the source models.
      * This may safely be called from a realtime thread.  Returns 0 if
      * there is no source yet available.
      */
     size_t getSourceChannelCount() const;
+
+    /**
+     * Get the number of channels of audio that will be provided
+     * to the play target.  This may be more than the source channel
+     * count: for example, a mono source will provide 2 channels
+     * after pan.
+     * This may safely be called from a realtime thread.  Returns 0 if
+     * there is no source yet available.
+     */
+    size_t getTargetChannelCount() const;
 
     /**
      * Get the actual sample rate of the source material.  This may
      * safely be called from a realtime thread.  Returns 0 if there is
      * no source yet available.

     };
 
     std::set<Model *>                m_models;
     RingBufferVector                *m_readBuffers;
     RingBufferVector                *m_writeBuffers;
+    size_t                           m_readBufferFill;
+    size_t                           m_writeBufferFill;
     Scavenger<RingBufferVector>      m_bufferScavenger;
     size_t                           m_sourceChannelCount;
     size_t                           m_blockSize;
     size_t                           m_sourceSampleRate;
     size_t                           m_targetSampleRate;
     size_t                           m_playLatency;
     bool                             m_playing;
     bool                             m_exiting;
-    size_t                           m_bufferedToFrame;
     size_t                           m_lastModelEndFrame;
     static const size_t              m_ringBufferSize;
     float                            m_outputLeft;
     float                            m_outputRight;
 

 	    return 0;
 	}
     }
 
     void clearRingBuffers(bool haveLock = false, size_t count = 0);
+    void unifyRingBuffers();
 
     class TimeStretcherData
     {
     public:
 	TimeStretcherData(size_t channels, size_t factor, size_t blockSize);