Chromium Code Reviews| Index: media/audio/audio_manager_base.h |
| diff --git a/media/audio/audio_manager_base.h b/media/audio/audio_manager_base.h |
| index 346fe47f79bb6ab2b6931f3ba38edd452e12cb16..607a8bc18360df5789e7ca2754d418036ef8d3b2 100644 |
| --- a/media/audio/audio_manager_base.h |
| +++ b/media/audio/audio_manager_base.h |
| @@ -28,17 +28,14 @@ class AudioOutputDispatcher; |
| // AudioManagerBase provides AudioManager functions common for all platforms. |
| class MEDIA_EXPORT AudioManagerBase : public AudioManager { |
| public: |
| - // TODO(sergeyu): The constants below belong to AudioManager interface, not |
| - // to the base implementation. |
| - |
| - // Name of the generic "default" device. |
| - static const char kDefaultDeviceName[]; |
| - // Unique Id of the generic "default" device. |
| + // TODO(ajm): Move these strings to AudioManager. |
|
ajm
2015/09/15 00:04:25
I indeed intend to do this in a follow-up. Avoided
|
| + // Unique Id of the generic "default" device. Associated with the localized |
| + // name returned from GetDefaultDeviceName(). |
| static const char kDefaultDeviceId[]; |
|
ajm
2015/09/15 00:04:25
The DeviceIDs aren't exposed to users so don't nee
|
| - // Unique Id of the generic default communications device (where supported). |
| + |
| + // Unique Id of the generic default communications device. Associated with |
| + // the localized name returned from GetCommunicationsDeviceName(). |
| static const char kCommunicationsDeviceId[]; |
| - // Name of the generic default communications device (where supported). |
| - static const char kCommunicationsDeviceName[]; |
| // Input device ID used to capture the default system playback stream. When |
| // this device ID is passed to MakeAudioInputStream() the returned |
| @@ -59,6 +56,9 @@ class MEDIA_EXPORT AudioManagerBase : public AudioManager { |
| void ShowAudioInputSettings() override; |
| void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override; |
| void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override; |
| + std::string GetDefaultDeviceName() const override; |
| + std::string GetCommunicationsDeviceName() const override; |
| + |
| AudioOutputStream* MakeAudioOutputStream( |
| const AudioParameters& params, |
| const std::string& device_id) override; |