Consistently use “video card” instead of “card”.

[nageru] / audio_mixer.h

diff --git a/audio_mixer.h b/audio_mixer.h
index d45fd438153de3b6c768d59e760bb4c6b64c16d1..0fe34185ca68b0f334a8a84703bf3fe4b44551a7 100644 (file)
--- a/audio_mixer.h
+++ b/audio_mixer.h
@@ -46,6 +46,10 @@ struct DeviceSpec {
                return index < other.index;
        }
 };
+struct DeviceInfo {
+       std::string name;
+       unsigned num_channels;
+};
 
 static inline uint64_t DeviceSpec_to_key(const DeviceSpec &device_spec)
 {
@@ -81,7 +85,7 @@ public:
        void set_current_loudness(double level_lufs) { loudness_lufs = level_lufs; }
 
        void set_fader_volume(unsigned bus_index, float level_db) { fader_volume_db[bus_index] = level_db; }
-       std::map<DeviceSpec, std::string> get_names() const;
+       std::map<DeviceSpec, DeviceInfo> get_devices() const;
        void set_name(DeviceSpec device_spec, const std::string &name);
 
        void set_input_mapping(const InputMapping &input_mapping);
@@ -211,7 +215,7 @@ private:
 
        mutable std::mutex audio_mutex;
 
-       AudioDevice cards[MAX_CARDS];  // Under audio_mutex.
+       AudioDevice video_cards[MAX_VIDEO_CARDS];  // Under audio_mutex.
 
        StereoFilter locut;  // Default cutoff 120 Hz, 24 dB/oct.
        std::atomic<float> locut_cutoff_hz;