From 948a0eefdac686bf752dd26ee41de53c697b9e01 Mon Sep 17 00:00:00 2001 From: "milanb@chromium.org" Date: Wed, 5 Sep 2012 20:56:50 +0000 Subject: 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 --- media/audio/audio_manager_base.cc | 11 +++++++++++ 1 file changed, 11 insertions(+) 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& 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 -- cgit v1.1