Make the samples_card array capable of storing samples from multiple kinds of cards.

[nageru] / audio_mixer.h

diff --git a/audio_mixer.h b/audio_mixer.h
index 0fe34185ca68b0f334a8a84703bf3fe4b44551a7..cee5f700a9e5b4645e5eaef9f32212ee51c96833 100644 (file)
--- a/audio_mixer.h
+++ b/audio_mixer.h
@@ -207,9 +207,10 @@ private:
        };
        AudioDevice *find_audio_device(DeviceSpec device_spec);
 
-       void find_sample_src_from_device(const std::vector<float> *samples_card, DeviceSpec device_spec, int source_channel, const float **srcptr, unsigned *stride);
-       void fill_audio_bus(const std::vector<float> *samples_card, const InputMapping::Bus &bus, unsigned num_samples, float *output);
+       void find_sample_src_from_device(const std::map<DeviceSpec, std::vector<float>> &samples_card, DeviceSpec device_spec, int source_channel, const float **srcptr, unsigned *stride);
+       void fill_audio_bus(const std::map<DeviceSpec, std::vector<float>> &samples_card, const InputMapping::Bus &bus, unsigned num_samples, float *output);
        void reset_device_mutex_held(DeviceSpec device_spec);
+       std::map<DeviceSpec, DeviceInfo> get_devices_mutex_held() const;
 
        unsigned num_cards;