diff options
| author | milanb@chromium.org <milanb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-09 13:22:53 +0000 |
|---|---|---|
| committer | milanb@chromium.org <milanb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-09 13:22:53 +0000 |
| commit | c251570e695be2b5bdedefe177c854b5d8514ab8 (patch) | |
| tree | e41d3c542bacbcde299a633dee90f2e14e53d43c /media/audio/ios/audio_manager_ios.mm | |
| parent | 7cad0f97e3ab583b78cf6d824f47c46e0ee83879 (diff) | |
| download | chromium_src-c251570e695be2b5bdedefe177c854b5d8514ab8.zip chromium_src-c251570e695be2b5bdedefe177c854b5d8514ab8.tar.gz chromium_src-c251570e695be2b5bdedefe177c854b5d8514ab8.tar.bz2 | |
Enable iOS background music.
Setting an audio flag that enables playing a background music during browsing.
This flag does not affect either speech input or media playback, they
still work as before.
BUG=None
Review URL: https://chromiumcodereview.appspot.com/11293176
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166902 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio/ios/audio_manager_ios.mm')
| -rw-r--r-- | media/audio/ios/audio_manager_ios.mm | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/media/audio/ios/audio_manager_ios.mm b/media/audio/ios/audio_manager_ios.mm index cdae9ad..a4ffff5 100644 --- a/media/audio/ios/audio_manager_ios.mm +++ b/media/audio/ios/audio_manager_ios.mm @@ -25,6 +25,9 @@ static bool InitAudioSessionInternal() { BOOL result = [audioSession setCategory:AVAudioSessionCategoryPlayAndRecord error:nil]; DCHECK(result); + UInt32 allowMixing = true; + AudioSessionSetProperty(kAudioSessionProperty_OverrideCategoryMixWithOthers, + sizeof(allowMixing), &allowMixing); return error == kAudioSessionNoError; } |