diff options
| author | enal@chromium.org <enal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-19 17:44:10 +0000 |
|---|---|---|
| committer | enal@chromium.org <enal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-19 17:44:10 +0000 |
| commit | 08c1c1399c69de70485abcbc80ba9884f8d41224 (patch) | |
| tree | c27b9f6d0608d3750fbfbab7d2b1c7cdf62e7f28 /media/audio/audio_output_proxy.h | |
| parent | 3ae7a56eddef4427b218c2151bb331a02a5cc394 (diff) | |
| download | chromium_src-08c1c1399c69de70485abcbc80ba9884f8d41224.zip chromium_src-08c1c1399c69de70485abcbc80ba9884f8d41224.tar.gz chromium_src-08c1c1399c69de70485abcbc80ba9884f8d41224.tar.bz2 | |
Re-land software audio mixer.
Code goes through old or new paths depending on the AudioParameters or command-line flag.
Added unit tests.
Changed suppression for http://code.google.com/p/chromium/issues/detail?id=123112
because call stack changed (class was split into 2).
Review URL: http://codereview.chromium.org/9691001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133010 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio/audio_output_proxy.h')
| -rw-r--r-- | media/audio/audio_output_proxy.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/media/audio/audio_output_proxy.h b/media/audio/audio_output_proxy.h index d34f81f..1fb35a3 100644 --- a/media/audio/audio_output_proxy.h +++ b/media/audio/audio_output_proxy.h @@ -53,10 +53,6 @@ class MEDIA_EXPORT AudioOutputProxy scoped_refptr<AudioOutputDispatcher> dispatcher_; State state_; - // The actual audio stream. Must be set to NULL in any state other - // than kPlaying. - AudioOutputStream* physical_stream_; - // Need to save volume here, so that we can restore it in case the stream // is stopped, and then started again. double volume_; |