Disable AudioOutputMixer.

media/audio/audio_manager_base.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/audio/audio_manager_base.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop_proxy.h"
 #include "base/threading/thread.h"
 #include "media/audio/audio_output_dispatcher_impl.h"
-#include "media/audio/audio_output_mixer.h"
+// TODO(dalecurtis): Temporarily disabled while switching over to floats.
+// #include "media/audio/audio_output_mixer.h"

[scherkus (not reviewing), 2012/08/09 22:12:39]

this is better handled via an #ifdef

i.e., after the includes have the following:

// TODO(dalecurtis): etc...
#if defined(ENABLE_AUDIO_MIXER)
#include "media/audio/audio_output_mixer.h"
#endif

... snip ...

#if defined(ENABLE_AUDIO_MIXER)
cmd_line->HasSwitch(...)
#endif 


that way it's easier to re-enable and the diffs are smaller

[DaleCurtis, 2012/08/09 22:46:29]

Done.

 #include "media/audio/audio_output_proxy.h"
 #include "media/audio/fake_audio_input_stream.h"
 #include "media/audio/fake_audio_output_stream.h"
 #include "media/base/media_switches.h"
 
 namespace media {
 
 static const int kStreamCloseDelaySeconds = 5;
 
 // Default maximum number of output streams that can be open simultaneously
@@ skipping 112 matching lines @@
 
 AudioOutputStream* AudioManagerBase::MakeAudioOutputStreamProxy(
     const AudioParameters& params) {
   DCHECK(GetMessageLoop()->BelongsToCurrentThread());
 
   scoped_refptr<AudioOutputDispatcher>& dispatcher =
       output_dispatchers_[params];
   if (!dispatcher) {
     base::TimeDelta close_delay =
         base::TimeDelta::FromSeconds(kStreamCloseDelaySeconds);
-    const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
+    // TODO(dalecurtis): Temporarily disabled while switching over to floats.

[scherkus (not reviewing), 2012/08/09 22:12:39]

link to bug?

[DaleCurtis, 2012/08/09 22:46:29]

Done.

     // TODO(dalecurtis): Browser side mixing has a couple issues that must be
     // fixed before it can be turned on by default: http://crbug.com/138098 and
     // http://crbug.com/140247
-    if (cmd_line->HasSwitch(switches::kEnableAudioMixer)) {
-      dispatcher = new AudioOutputMixer(this, params, close_delay);
-    } else {
-      dispatcher = new AudioOutputDispatcherImpl(this, params, close_delay);
-    }
+    // const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
+    // if (cmd_line->HasSwitch(switches::kEnableAudioMixer))
+    //   dispatcher = new AudioOutputMixer(this, params, close_delay);
+    // else
+    dispatcher = new AudioOutputDispatcherImpl(this, params, close_delay);
   }
   return new AudioOutputProxy(dispatcher);
 }
 
 bool AudioManagerBase::CanShowAudioInputSettings() {
   return false;
 }
 
 void AudioManagerBase::ShowAudioInputSettings() {
 }
@@ skipping 72 matching lines @@
       // So, better crash now than later.
       DCHECK(dispatcher->HasOneRef()) << "AudioOutputProxies are still alive";
       dispatcher = NULL;
     }
   }
 
   output_dispatchers_.clear();
 }
 
 }  // namespace media