| Index: media/audio/audio_device_description.h
|
| diff --git a/media/audio/audio_device_description.h b/media/audio/audio_device_description.h
|
| index bc70e237fd065659a08058cb30eff5a68b9b63c5..d58f04c1093a0acd4d6663207d6b850bf6b8616e 100644
|
| --- a/media/audio/audio_device_description.h
|
| +++ b/media/audio/audio_device_description.h
|
| @@ -6,13 +6,13 @@
|
| #define MEDIA_AUDIO_AUDIO_DEVICE_DESCRIPTION_H_
|
|
|
| #include <string>
|
| +#include <vector>
|
| #include "media/base/media_export.h"
|
|
|
| namespace media {
|
|
|
| // Provides common information on audio device names and ids.
|
| -class MEDIA_EXPORT AudioDeviceDescription {
|
| - public:
|
| +struct MEDIA_EXPORT AudioDeviceDescription {
|
| // Unique Id of the generic "default" device. Associated with the localized
|
| // name returned from GetDefaultDeviceName().
|
| static const char kDefaultDeviceId[];
|
| @@ -53,11 +53,20 @@ class MEDIA_EXPORT AudioDeviceDescription {
|
| // This device is not supported on all platforms.
|
| static std::string GetCommunicationsDeviceName();
|
|
|
| - private:
|
| - AudioDeviceDescription() {}
|
| - ~AudioDeviceDescription() {}
|
| + AudioDeviceDescription(const AudioDeviceDescription& other) = default;
|
| + AudioDeviceDescription(const std::string& device_name,
|
| + const std::string& unique_id,
|
| + const std::string& group_id);
|
| +
|
| + ~AudioDeviceDescription() = default;
|
| +
|
| + std::string device_name; // Friendly name of the device.
|
| + std::string unique_id; // Unique identifier for the device.
|
| + std::string group_id; // Group identifier.
|
| };
|
|
|
| +typedef std::vector<AudioDeviceDescription> AudioDeviceDescriptions;
|
| +
|
| } // namespace media
|
|
|
| #endif // MEDIA_AUDIO_AUDIO_DEVICE_DESCRIPTION_H_
|
|
|