Output device enumeration for Alsa, plus unit test.

media/audio/linux/audio_manager_linux.h

Index: media/audio/linux/audio_manager_linux.h
diff --git a/media/audio/linux/audio_manager_linux.h b/media/audio/linux/audio_manager_linux.h
index 28abaa116e79dbd0323ed8bb2393ee7da1a36545..7d0305e287ce49b6c9ae010d3c5e7f92aa8957d1 100644
--- a/media/audio/linux/audio_manager_linux.h
+++ b/media/audio/linux/audio_manager_linux.h
@@ -27,6 +27,8 @@ class MEDIA_EXPORT AudioManagerLinux : public AudioManagerBase {
   virtual void ShowAudioInputSettings() OVERRIDE;
   virtual void GetAudioInputDeviceNames(media::AudioDeviceNames* device_names)
       OVERRIDE;
+  virtual void GetAudioOutputDeviceNames(media::AudioDeviceNames* device_names)
+      OVERRIDE;
   virtual AudioParameters GetInputStreamParameters(
       const std::string& device_id) OVERRIDE;
 
@@ -53,14 +55,21 @@ class MEDIA_EXPORT AudioManagerLinux : public AudioManagerBase {
     kStreamCapture,
   };
 
-  // Gets a list of available ALSA input devices.
-  void GetAlsaAudioInputDevices(media::AudioDeviceNames* device_names);
+  // Gets a list of available ALSA devices.
+  void GetAlsaAudioDevices(StreamType type,
+                           media::AudioDeviceNames* device_names);
 
-  // Gets the ALSA devices' names and ids.
-  void GetAlsaDevicesInfo(void** hint, media::AudioDeviceNames* device_names);
+  // Gets the ALSA devices' names and ids that support streams of the
+  // given type.
+  void GetAlsaDevicesInfo(StreamType type,
+                          void** hint,
+                          media::AudioDeviceNames* device_names);
 
   // Checks if the specific ALSA device is available.
-  bool IsAlsaDeviceAvailable(const char* device_name);
+  bool IsAlsaDeviceAvailable(StreamType type,
+                             const char* device_name);
+
+  const char* UnwantedDeviceTypeWhenEnumerating(StreamType wanted_type);

[tommi (sloooow) - chröme, 2013/09/04 14:32:51]

Can this be just a static method in the cc file? (does it need to be a member
function?)

[Jói, 2013/09/04 15:32:22]

In order to let it use the StreamType enum, we have options:
a) Keep like this;
b) Make StreamType public;
c) Make the function a friend; or last but definitely not least,
d) Switch all of the private implementation to a pImpl (OVERKILL :)

I thought it was just most straightforward like this.

 
   // Returns true if a device is present for the given stream type.
   bool HasAnyAlsaAudioDevice(StreamType stream);