Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(171)

Unified Diff: media/audio/android/audio_manager_android.cc

Issue 17491007: Enable audio volume control on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: rebase and update description Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | media/audio/android/opensles_input.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/android/audio_manager_android.cc
===================================================================
--- media/audio/android/audio_manager_android.cc (revision 207874)
+++ media/audio/android/audio_manager_android.cc (working copy)
@@ -72,8 +72,10 @@
const AudioParameters& params, const std::string& input_device_id) {
AudioOutputStream* stream =
AudioManagerBase::MakeAudioOutputStream(params, std::string());
- if (stream && output_stream_count() == 1)
+ if (stream && output_stream_count() == 1) {
+ SetAudioMode(kAudioModeInCommunication);
RegisterHeadsetReceiver();
+ }
return stream;
}
@@ -81,21 +83,19 @@
const AudioParameters& params, const std::string& device_id) {
AudioInputStream* stream =
AudioManagerBase::MakeAudioInputStream(params, device_id);
- if (stream && input_stream_count() == 1)
- SetAudioMode(kAudioModeInCommunication);
return stream;
}
void AudioManagerAndroid::ReleaseOutputStream(AudioOutputStream* stream) {
AudioManagerBase::ReleaseOutputStream(stream);
- if (!output_stream_count())
+ if (!output_stream_count()) {
UnregisterHeadsetReceiver();
+ SetAudioMode(kAudioModeNormal);
+ }
}
void AudioManagerAndroid::ReleaseInputStream(AudioInputStream* stream) {
AudioManagerBase::ReleaseInputStream(stream);
- if (!input_stream_count())
- SetAudioMode(kAudioModeNormal);
}
AudioOutputStream* AudioManagerAndroid::MakeLinearOutputStream(
« no previous file with comments | « no previous file | media/audio/android/opensles_input.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698