Cleanup: don't need to store _{input,output}_channels.

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

diff --git a/src/lib/audio_mapping.h b/src/lib/audio_mapping.h
index 6bac0a7d8eb43fa2f8e5ea2f50091267a005ebec..0f59cc205ee35937f6ed9727aab40aef4c9d4dcd 100644 (file)
--- a/src/lib/audio_mapping.h
+++ b/src/lib/audio_mapping.h
@@ -18,30 +18,35 @@
 
 */
 
+
 /** @file  src/lib/audio_mapping.h
  *  @brief AudioMapping class.
  */
 
+
 #ifndef DCPOMATIC_AUDIO_MAPPING_H
 #define DCPOMATIC_AUDIO_MAPPING_H
 
+
 #include <dcp/types.h>
 #include <libcxml/cxml.h>
 #include <vector>
 
+
 namespace xmlpp {
        class Node;
 }
 
 class AudioProcessor;
 
+
 /** @class AudioMapping.
  *  @brief A many-to-many mapping of audio channels.
  */
 class AudioMapping
 {
 public:
-       AudioMapping ();
+       AudioMapping () {}
        AudioMapping (int input_channels, int output_channels);
        AudioMapping (cxml::ConstNodePtr, int);
 
@@ -59,11 +64,11 @@ public:
        float get (int input_channel, dcp::Channel output_channel) const;
 
        int input_channels () const {
-               return _input_channels;
+               return _gain.size();
        }
 
        int output_channels () const {
-               return _output_channels;
+               return _gain.empty() ? 0 : _gain[0].size();
        }
 
        std::string digest () const;
@@ -74,9 +79,9 @@ public:
 private:
        void setup (int input_channels, int output_channels);
 
-       int _input_channels;
-       int _output_channels;
-       std::vector<std::vector<float> > _gain;
+       /** Linear gains */
+       std::vector<std::vector<float>> _gain;
 };
 
+
 #endif