summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-10 22:06:59 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-10 22:06:59 +0000
commit1e70ce58aa2d9fdba7a05417028658f789e08acb (patch)
treeb3862e45ea9758999ed48e3ce410594fdb595c2c /media
parentbe8a9272d49fa6d059d64e8c33da05d36ea45eb5 (diff)
downloadchromium_src-1e70ce58aa2d9fdba7a05417028658f789e08acb.zip
chromium_src-1e70ce58aa2d9fdba7a05417028658f789e08acb.tar.gz
chromium_src-1e70ce58aa2d9fdba7a05417028658f789e08acb.tar.bz2
Override AudioManager::MakeAudioInputStream() in NullAudioManager.
BUG=72577 TEST=None Review URL: http://codereview.chromium.org/6487008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74492 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/audio/audio_manager.cc16
1 files changed, 9 insertions, 7 deletions
diff --git a/media/audio/audio_manager.cc b/media/audio/audio_manager.cc
index bc91c63..a8d14fd 100644
--- a/media/audio/audio_manager.cc
+++ b/media/audio/audio_manager.cc
@@ -5,6 +5,7 @@
#include "media/audio/audio_manager.h"
#include "base/at_exit.h"
+#include "base/compiler_specific.h"
#include "base/logging.h"
namespace {
@@ -19,19 +20,20 @@ class NullAudioManager : public AudioManager {
NullAudioManager() { }
// Implementation of AudioManager.
- virtual bool HasAudioOutputDevices() { return false; }
- virtual bool HasAudioInputDevices() { return false; }
- virtual AudioOutputStream* MakeAudioOutputStream(AudioParameters params) {
+ virtual bool HasAudioOutputDevices() OVERRIDE { return false; }
+ virtual bool HasAudioInputDevices() OVERRIDE { return false; }
+ virtual AudioOutputStream* MakeAudioOutputStream(
+ AudioParameters params) OVERRIDE {
NOTIMPLEMENTED();
return NULL;
}
- virtual AudioInputStream* MakeAudioInputStream(AudioParameters params,
- int samples_per_packet) {
+ virtual AudioInputStream* MakeAudioInputStream(
+ AudioParameters params) OVERRIDE {
NOTIMPLEMENTED();
return NULL;
}
- virtual void MuteAll() { NOTIMPLEMENTED(); }
- virtual void UnMuteAll() { NOTIMPLEMENTED(); }
+ virtual void MuteAll() OVERRIDE { NOTIMPLEMENTED(); }
+ virtual void UnMuteAll() OVERRIDE { NOTIMPLEMENTED(); }
private:
DISALLOW_COPY_AND_ASSIGN(NullAudioManager);