diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-27 23:44:14 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-27 23:44:14 +0000 |
| commit | 9d4d1e4dff1bb10542adbdf568b3920f2ba47a4a (patch) | |
| tree | 5bb35a71ca70abcab767f2c218bf8be4bc9d9d37 /media/audio | |
| parent | 02230e9152bd2b962a681d7fee759ef258914eb7 (diff) | |
| download | chromium_src-9d4d1e4dff1bb10542adbdf568b3920f2ba47a4a.zip chromium_src-9d4d1e4dff1bb10542adbdf568b3920f2ba47a4a.tar.gz chromium_src-9d4d1e4dff1bb10542adbdf568b3920f2ba47a4a.tar.bz2 | |
Change default audio device from "plug:default" to "default".
Review URL: http://codereview.chromium.org/113923
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17040 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio')
| -rw-r--r-- | media/audio/linux/alsa_output.cc | 2 | ||||
| -rw-r--r-- | media/audio/linux/alsa_output.h | 5 | ||||
| -rw-r--r-- | media/audio/linux/audio_manager_linux.cc | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/media/audio/linux/alsa_output.cc b/media/audio/linux/alsa_output.cc index 0dc9ca9..f53d855 100644 --- a/media/audio/linux/alsa_output.cc +++ b/media/audio/linux/alsa_output.cc @@ -69,7 +69,7 @@ static const unsigned int kTargetLatencyMicroseconds = 10000; // adjust accordingly. static const int64 kMinSleepMilliseconds = 10L; -const char* AlsaPCMOutputStream::kDefaultDevice = "plug:default"; +const char* AlsaPCMOutputStream::kDefaultDevice = "default"; AlsaPCMOutputStream::AlsaPCMOutputStream(const std::string& device_name, int min_buffer_ms, diff --git a/media/audio/linux/alsa_output.h b/media/audio/linux/alsa_output.h index b6d405b..42cd3c8 100644 --- a/media/audio/linux/alsa_output.h +++ b/media/audio/linux/alsa_output.h @@ -43,8 +43,9 @@ class AlsaPCMOutputStream : public AudioOutputStream, public base::RefCountedThreadSafe<AlsaPCMOutputStream> { public: - // Set to "plug:default" which should allow ALSA to do whatever is - // necessary to simulate an audio device capable of handling our PCMs. + // Set to "default" which should avoid locking the sound device and allow + // ALSA to multiplex sound from different processes that want to write PCM + // data. static const char* kDefaultDevice; // Create a PCM Output stream for the ALSA device identified by diff --git a/media/audio/linux/audio_manager_linux.cc b/media/audio/linux/audio_manager_linux.cc index afe1c3c..69e8b9b 100644 --- a/media/audio/linux/audio_manager_linux.cc +++ b/media/audio/linux/audio_manager_linux.cc @@ -22,7 +22,7 @@ AudioOutputStream* AudioManagerLinux::MakeAudioStream(Format format, int channels, int sample_rate, char bits_per_sample) { - // TODO(ajwong): Do we want to be able to configure the device? plug:default + // TODO(ajwong): Do we want to be able to configure the device? default // should work correctly for all mono/stereo, but not surround, which needs // surround40, surround51, etc. // |