summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormilanb@chromium.org <milanb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-05 20:56:50 +0000
committermilanb@chromium.org <milanb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-05 20:56:50 +0000
commit948a0eefdac686bf752dd26ee41de53c697b9e01 (patch)
tree3d131aa6dc21d9095956a267693a54c6cccc193a
parent6885b7338bd3d0e3520115ecb431f954a7effecc (diff)
downloadchromium_src-948a0eefdac686bf752dd26ee41de53c697b9e01.zip
chromium_src-948a0eefdac686bf752dd26ee41de53c697b9e01.tar.gz
chromium_src-948a0eefdac686bf752dd26ee41de53c697b9e01.tar.bz2
Exclude audio output dispatcher for iOS.
Upstreaming iOS. iOS uses only audio input and does not link against the audio output classes. BUG=b/6754065 Review URL: https://chromiumcodereview.appspot.com/10914082 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155011 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--media/audio/audio_manager_base.cc11
1 files changed, 11 insertions, 0 deletions
diff --git a/media/audio/audio_manager_base.cc b/media/audio/audio_manager_base.cc
index 137cc17..7e5cc43 100644
--- a/media/audio/audio_manager_base.cc
+++ b/media/audio/audio_manager_base.cc
@@ -140,6 +140,11 @@ AudioInputStream* AudioManagerBase::MakeAudioInputStream(
AudioOutputStream* AudioManagerBase::MakeAudioOutputStreamProxy(
const AudioParameters& params) {
+#if defined(OS_IOS)
+ // IOS implements audio input only.
+ NOTIMPLEMENTED();
+ return NULL;
+#else
DCHECK(GetMessageLoop()->BelongsToCurrentThread());
scoped_refptr<AudioOutputDispatcher>& dispatcher =
@@ -159,6 +164,7 @@ AudioOutputStream* AudioManagerBase::MakeAudioOutputStreamProxy(
dispatcher = new AudioOutputDispatcherImpl(this, params, close_delay);
}
return new AudioOutputProxy(dispatcher);
+#endif // defined(OS_IOS)
}
bool AudioManagerBase::CanShowAudioInputSettings() {
@@ -226,6 +232,10 @@ void AudioManagerBase::Shutdown() {
}
void AudioManagerBase::ShutdownOnAudioThread() {
+// IOS implements audio input only.
+#if defined(OS_IOS)
+ return;
+#else
// This should always be running on the audio thread, but since we've cleared
// the audio_thread_ member pointer when we get here, we can't verify exactly
// what thread we're running on. The method is not public though and only
@@ -246,6 +256,7 @@ void AudioManagerBase::ShutdownOnAudioThread() {
}
output_dispatchers_.clear();
+#endif // defined(OS_IOS)
}
} // namespace media