Fix assertion failure when processors return fewer channels than the DCP has.

[dcpomatic.git] / src / lib / upmixer_a.h

diff --git a/src/lib/upmixer_a.h b/src/lib/upmixer_a.h
index 32e3f5fb625c4b7875c5407dc509acfe180e09e1..a25c3a32927c2add53145d8910f113cd0438739d 100644 (file)
--- a/src/lib/upmixer_a.h
+++ b/src/lib/upmixer_a.h
@@ -17,21 +17,30 @@
 
 */
 
+/** @file  src/lib/upmixer_a.h
+ *  @brief UpmixerA class.
+ */
+
 #include "audio_processor.h"
 #include "audio_filter.h"
 
+/** @class UpmixerA
+ *  @brief Stereo to 5.1 upmixer algorithm by Gérald Maruccia.
+ */
 class UpmixerA : public AudioProcessor
 {
 public:
        UpmixerA (int sampling_rate);
-       
+
        std::string name () const;
        std::string id () const;
        ChannelCount in_channels () const;
-       int out_channels (int) const;
+       int out_channels () const;
        boost::shared_ptr<AudioProcessor> clone (int) const;
-       boost::shared_ptr<AudioBuffers> run (boost::shared_ptr<const AudioBuffers>);
+       boost::shared_ptr<AudioBuffers> run (boost::shared_ptr<const AudioBuffers>, int channels);
        void flush ();
+       void make_audio_mapping_default (AudioMapping& mapping) const;
+       std::vector<std::string> input_names () const;
 
 private:
        BandPassAudioFilter _left;