summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-16 20:59:26 +0000
committerhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-16 20:59:26 +0000
commit471aa54458251126a6bfb918a4b602f3f2a4abe9 (patch)
tree335a5d280ebc993c46facaf8bf0e54841d2c3ce2 /media
parent6be3ef5995c3d46a73c0d4a13091c56972c821ab (diff)
downloadchromium_src-471aa54458251126a6bfb918a4b602f3f2a4abe9.zip
chromium_src-471aa54458251126a6bfb918a4b602f3f2a4abe9.tar.gz
chromium_src-471aa54458251126a6bfb918a4b602f3f2a4abe9.tar.bz2
Revert r9861 to fix build
TBR=? Review URL: http://codereview.chromium.org/21399 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9862 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/audio/audio_output.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/media/audio/audio_output.h b/media/audio/audio_output.h
index 12ef3d99..7d82500 100644
--- a/media/audio/audio_output.h
+++ b/media/audio/audio_output.h
@@ -104,11 +104,9 @@ class AudioOutputStream {
class AudioManager {
public:
enum Format {
- AUDIO_PCM_LINEAR = 0, // Pulse code modulation means 'raw' amplitude
- // samples.
- AUDIO_PCM_DELTA, // Delta-encoded pulse code modulation.
- AUDIO_MOCK, // Creates a dummy AudioOutputStream object.
- AUDIO_LAST_FORMAT // Only used for validation of format.
+ AUDIO_PCM_LINEAR, // Pulse code modulation means 'raw' amplitude samples.
+ AUDIO_PCM_DELTA, // Delta-encoded pulse code modulation.
+ AUDIO_MOCK // Creates a dummy AudioOutputStream object.
};
// Telephone quality sample rate, mostly for speech-only audio.