diff options
| author | vrk@google.com <vrk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-02 19:50:50 +0000 |
|---|---|---|
| committer | vrk@google.com <vrk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-02 19:50:50 +0000 |
| commit | f3a1b854e9afeeee2121abda50df6da9242c4410 (patch) | |
| tree | 5bd99fea32252ef037bc8b936ec19f04bd50e868 /media/audio/simple_sources.h | |
| parent | 897bfb5aaaa57f0338a77fada1d5d3f9c3b38226 (diff) | |
| download | chromium_src-f3a1b854e9afeeee2121abda50df6da9242c4410.zip chromium_src-f3a1b854e9afeeee2121abda50df6da9242c4410.tar.gz chromium_src-f3a1b854e9afeeee2121abda50df6da9242c4410.tar.bz2 | |
Revert 130180 - Move media/audio files into media namespace
BUG=115187
TEST=compiles and runs without breaking audio tag; media_unittests, content_unittests
Review URL: https://chromiumcodereview.appspot.com/9805001
TBR=vrk@google.com
Review URL: https://chromiumcodereview.appspot.com/9965076
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130182 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio/simple_sources.h')
| -rw-r--r-- | media/audio/simple_sources.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/media/audio/simple_sources.h b/media/audio/simple_sources.h index fa06857..a4373a0 100644 --- a/media/audio/simple_sources.h +++ b/media/audio/simple_sources.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -10,8 +10,6 @@ #include "media/audio/audio_io.h" #include "media/base/seekable_buffer.h" -namespace media { - // An audio source that produces a pure sinusoidal tone. class MEDIA_EXPORT SineWaveAudioSource : public AudioOutputStream::AudioSourceCallback { @@ -90,6 +88,4 @@ class MEDIA_EXPORT PushSource media::SeekableBuffer buffer_; }; -} // namespace media - #endif // MEDIA_AUDIO_SIMPLE_SOURCES_H_ |