diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-19 02:48:09 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-19 02:48:09 +0000 |
| commit | e8e3519eef539f73ed55eb345e21ab409c1d53d4 (patch) | |
| tree | 72e46c4450b4cdab41c08c172ff58a9f1a395929 /media/audio/audio_output_proxy.h | |
| parent | 62405028eba3eab760007a3e736426927f3f3435 (diff) | |
| download | chromium_src-e8e3519eef539f73ed55eb345e21ab409c1d53d4.zip chromium_src-e8e3519eef539f73ed55eb345e21ab409c1d53d4.tar.gz chromium_src-e8e3519eef539f73ed55eb345e21ab409c1d53d4.tar.bz2 | |
Revert 132891 - Software audio mixer.
Code goes through old or new paths depending on the AudioParameters or command-line flag.
Added unit tests.
Review URL: http://codereview.chromium.org/9691001
TBR=enal@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10127002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132929 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, 4 insertions, 0 deletions
diff --git a/media/audio/audio_output_proxy.h b/media/audio/audio_output_proxy.h index 1fb35a3..d34f81f 100644 --- a/media/audio/audio_output_proxy.h +++ b/media/audio/audio_output_proxy.h @@ -53,6 +53,10 @@ 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_; |