Rename InputMapping::Input to InputMapping::Bus; it's less ambiguous.

[nageru] / audio_mixer.h

diff --git a/audio_mixer.h b/audio_mixer.h
index 0c7a0a3ab64af48cff1625b0bb1ea74aee660b05..5a36475b6c1d9122ffd1b4b6725b2db275bea6e7 100644 (file)
--- a/audio_mixer.h
+++ b/audio_mixer.h
@@ -34,14 +34,14 @@ struct AudioFormat;
 enum class InputSourceType { SILENCE, CAPTURE_CARD };
 
 struct InputMapping {
-       struct Input {  // TODO: rename to Bus?
+       struct Bus {
                std::string name;
                InputSourceType input_source_type;
                unsigned input_source_index;
                int source_channel[2] { -1, -1 };  // Left and right. -1 = none.
        };
 
-       std::vector<Input> inputs;
+       std::vector<Bus> buses;
 };
 
 class AudioMixer {
@@ -57,7 +57,7 @@ public:
        // See comments inside get_output().
        void set_current_loudness(double level_lufs) { loudness_lufs = level_lufs; }
 
-       void set_fader_volume(unsigned input_index, float level_db) { fader_volume_db[input_index] = level_db; }
+       void set_fader_volume(unsigned bus_index, float level_db) { fader_volume_db[bus_index] = level_db; }
        std::vector<std::string> get_names() const;
        void set_name(unsigned card_index, const std::string &name);