| Index: chrome/browser/chromeos/audio_handler.cc
|
| diff --git a/chrome/browser/chromeos/audio_handler.cc b/chrome/browser/chromeos/audio_handler.cc
|
| index e027d42b4e04f5ad9ecfaa61ea4e2fac958a9a1f..ed2841a2aa3902902eb6f583274d7307a7e6515f 100644
|
| --- a/chrome/browser/chromeos/audio_handler.cc
|
| +++ b/chrome/browser/chromeos/audio_handler.cc
|
| @@ -95,18 +95,15 @@ void AudioHandler::SetMute(bool do_mute) {
|
| mixer_->SetMute(do_mute);
|
| }
|
|
|
| -void AudioHandler::OnMixerInitialized(bool success) {
|
| - connected_ = success;
|
| - DLOG(INFO) << "OnMixerInitialized, success = " << success;
|
| +bool AudioHandler::IsValid() {
|
| + return mixer_->CheckState() == PulseAudioMixer::READY;
|
| }
|
|
|
| AudioHandler::AudioHandler()
|
| - : connected_(false),
|
| - reconnect_tries_(0) {
|
| + : reconnect_tries_(0) {
|
| mixer_.reset(new PulseAudioMixer());
|
| - if (!mixer_->Init(NewCallback(this, &AudioHandler::OnMixerInitialized))) {
|
| - LOG(ERROR) << "Unable to connect to PulseAudio";
|
| - }
|
| + connected_ = mixer_->InitSync();
|
| + DLOG(INFO) << "Mixer connected = " << connected_;
|
| }
|
|
|
| AudioHandler::~AudioHandler() {
|
|
|