diff options
author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-16 15:17:36 +0000 |
---|---|---|
committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-16 15:17:36 +0000 |
commit | 73bb099092b34e95a73543134abb014ba44bd2cf (patch) | |
tree | 989d9e0919debd332d1023c324c6d13921d8783f /media/audio/pulse | |
parent | 3318a73e06101a692de1e61ad2599120e98cfb0d (diff) | |
download | chromium_src-73bb099092b34e95a73543134abb014ba44bd2cf.zip chromium_src-73bb099092b34e95a73543134abb014ba44bd2cf.tar.gz chromium_src-73bb099092b34e95a73543134abb014ba44bd2cf.tar.bz2 |
Implement GetAudioOutputDevices for remaining platforms, consolidate tests.
For Android and Cras, returning just the default device matches
current behavior for input devices, although this may need to be
improved in the future. For OpenBSD, the current code seems to rely on
the device names list being empty, so just removing the NOTREACHED() in
AudioManagerBase's empty implementation does the trick there.
Note that audio_input_device_unittest.cc really should be named
audio_manager_unittest.cc since AudioManager is the interface it tests.
I will do this rename in a separate follow-up change to better
preserve change history.
TBR=vrk@chromium.org
BUG=276894
Review URL: https://chromiumcodereview.appspot.com/23475037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223342 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio/pulse')
-rw-r--r-- | media/audio/pulse/audio_manager_pulse.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/media/audio/pulse/audio_manager_pulse.h b/media/audio/pulse/audio_manager_pulse.h index 8fc4310..3639663 100644 --- a/media/audio/pulse/audio_manager_pulse.h +++ b/media/audio/pulse/audio_manager_pulse.h @@ -25,10 +25,10 @@ class MEDIA_EXPORT AudioManagerPulse : public AudioManagerBase { virtual bool HasAudioOutputDevices() OVERRIDE; virtual bool HasAudioInputDevices() OVERRIDE; virtual void ShowAudioInputSettings() OVERRIDE; - virtual void GetAudioInputDeviceNames(media::AudioDeviceNames* device_names) - OVERRIDE; - virtual void GetAudioOutputDeviceNames(media::AudioDeviceNames* device_names) - OVERRIDE; + virtual void GetAudioInputDeviceNames( + AudioDeviceNames* device_names) OVERRIDE; + virtual void GetAudioOutputDeviceNames( + AudioDeviceNames* device_names) OVERRIDE; virtual AudioParameters GetInputStreamParameters( const std::string& device_id) OVERRIDE; |