summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-15 21:48:34 +0000
committerhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-15 21:48:34 +0000
commite7b559e09147e5d2e8e70ce3e79e69dcd1d99e1b (patch)
tree02210d48ff17e1ef1564fcfe0d54785bd80e4186
parentc5cbf4e32dbadb45aaac6e7f5dc076382f7054a7 (diff)
downloadchromium_src-e7b559e09147e5d2e8e70ce3e79e69dcd1d99e1b.zip
chromium_src-e7b559e09147e5d2e8e70ce3e79e69dcd1d99e1b.tar.gz
chromium_src-e7b559e09147e5d2e8e70ce3e79e69dcd1d99e1b.tar.bz2
AudioController sets volume to 1.0 by default
NaCl audio stop working because the demo NaCl plugin doesn't set volume. We revert to the original behavior of AudioController by setting volume to 1.0 by default. TBR=neb BUG=49807 TEST=NaCl audio plays Review URL: http://codereview.chromium.org/2966014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52548 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--media/audio/audio_output_controller.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/audio/audio_output_controller.cc b/media/audio/audio_output_controller.cc
index ffdfaa1..11ee96c 100644
--- a/media/audio/audio_output_controller.cc
+++ b/media/audio/audio_output_controller.cc
@@ -35,7 +35,7 @@ AudioOutputController::AudioOutputController(EventHandler* handler,
uint32 capacity,
SyncReader* sync_reader)
: handler_(handler),
- volume_(0),
+ volume_(1.0),
state_(kEmpty),
hardware_pending_bytes_(0),
buffer_capacity_(capacity),