| Index: media/audio/linux/alsa_util.h
|
| diff --git a/media/audio/linux/alsa_util.h b/media/audio/linux/alsa_util.h
|
| index 054d24db4d2c3bf30d4e3482cfeb4b355b26b806..53cf80af84c271ecba2b83f41afc09f0432d7ab0 100644
|
| --- a/media/audio/linux/alsa_util.h
|
| +++ b/media/audio/linux/alsa_util.h
|
| @@ -8,37 +8,40 @@
|
| #include <alsa/asoundlib.h>
|
| #include <string>
|
|
|
| +namespace media {
|
| class AlsaWrapper;
|
| +}
|
|
|
| namespace alsa_util {
|
|
|
| snd_pcm_format_t BitsToFormat(int bits_per_sample);
|
|
|
| -snd_pcm_t* OpenCaptureDevice(AlsaWrapper* wrapper,
|
| +snd_pcm_t* OpenCaptureDevice(media::AlsaWrapper* wrapper,
|
| const char* device_name,
|
| int channels,
|
| int sample_rate,
|
| snd_pcm_format_t pcm_format,
|
| int latency_us);
|
|
|
| -snd_pcm_t* OpenPlaybackDevice(AlsaWrapper* wrapper,
|
| +snd_pcm_t* OpenPlaybackDevice(media::AlsaWrapper* wrapper,
|
| const char* device_name,
|
| int channels,
|
| int sample_rate,
|
| snd_pcm_format_t pcm_format,
|
| int latency_us);
|
|
|
| -int CloseDevice(AlsaWrapper* wrapper, snd_pcm_t* handle);
|
| +int CloseDevice(media::AlsaWrapper* wrapper, snd_pcm_t* handle);
|
|
|
| -snd_mixer_t* OpenMixer(AlsaWrapper* wrapper, const std::string& device_name);
|
| +snd_mixer_t* OpenMixer(media::AlsaWrapper* wrapper,
|
| + const std::string& device_name);
|
|
|
| -void CloseMixer(AlsaWrapper* wrapper,
|
| +void CloseMixer(media::AlsaWrapper* wrapper,
|
| snd_mixer_t* mixer,
|
| const std::string& device_name);
|
|
|
| -snd_mixer_elem_t* LoadCaptureMixerElement(AlsaWrapper* wrapper,
|
| +snd_mixer_elem_t* LoadCaptureMixerElement(media::AlsaWrapper* wrapper,
|
| snd_mixer_t* mixer);
|
|
|
| -}
|
| +} // namespace alsa_util
|
|
|
| #endif // MEDIA_AUDIO_LINUX_ALSA_UTIL_H_
|
|
|