Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Switch camera sounds to always use the system enforced audio stream." into ics-mr1

Browse Source
This commit is contained in:
Eino-Ville Talvala
2012-01-06 15:46:36 -08:00
committed by Android (Google) Code Review
parent a476eed6b2 b7feb1c91f
commit 7944704e6c
3 changed files with 2 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/hardware/CameraSound.java
View File

@@ -110,7 +110,6 @@ public class CameraSound {
private static class CameraSoundPlayer implements Runnable { private static class CameraSoundPlayer implements Runnable {
private int mSoundId; private int mSoundId;
private int mAudioStreamType;
private MediaPlayer mPlayer; private MediaPlayer mPlayer;
private Thread mThread; private Thread mThread;
private boolean mExit; private boolean mExit;
@@ -147,7 +146,7 @@ public class CameraSound {
} }
mPlayer = new MediaPlayer(); mPlayer = new MediaPlayer();
try { try {
mPlayer.setAudioStreamType(mAudioStreamType); mPlayer.setAudioStreamType(AudioManager.STREAM_SYSTEM_ENFORCED);
mPlayer.setDataSource(soundFilePath); mPlayer.setDataSource(soundFilePath);
mPlayer.setLooping(false); mPlayer.setLooping(false);
mPlayer.prepare(); mPlayer.prepare();
@@ -179,11 +178,6 @@ public class CameraSound {
public CameraSoundPlayer(int soundId) { public CameraSoundPlayer(int soundId) {
mSoundId = soundId; mSoundId = soundId;
if (SystemProperties.get("ro.camera.sound.forced", "0").equals("0")) {
mAudioStreamType = AudioManager.STREAM_MUSIC;
} else {
mAudioStreamType = AudioManager.STREAM_SYSTEM_ENFORCED;
}
} }
public void play() { public void play() {

12
services/camera/libcameraservice/CameraService.cpp
View File

@@ -97,16 +97,6 @@ void CameraService::onFirstRef()
setCameraFree(i); setCameraFree(i);
} }
} }
// Read the system property to determine if we have to use the
// AUDIO_STREAM_ENFORCED_AUDIBLE type.
char value[PROPERTY_VALUE_MAX];
property_get("ro.camera.sound.forced", value, "0");
if (strcmp(value, "0") != 0) {
mAudioStreamType = AUDIO_STREAM_ENFORCED_AUDIBLE;
} else {
mAudioStreamType = AUDIO_STREAM_MUSIC;
}
} }
CameraService::~CameraService() { CameraService::~CameraService() {
@@ -295,7 +285,7 @@ void CameraService::setCameraFree(int cameraId) {
MediaPlayer* CameraService::newMediaPlayer(const char *file) { MediaPlayer* CameraService::newMediaPlayer(const char *file) {
MediaPlayer* mp = new MediaPlayer(); MediaPlayer* mp = new MediaPlayer();
if (mp->setDataSource(file, NULL) == NO_ERROR) { if (mp->setDataSource(file, NULL) == NO_ERROR) {
mp->setAudioStreamType(mAudioStreamType); mp->setAudioStreamType(AUDIO_STREAM_ENFORCED_AUDIBLE);
mp->prepare(); mp->prepare();
} else { } else {
LOGE("Failed to load CameraService sounds: %s", file); LOGE("Failed to load CameraService sounds: %s", file);

1
services/camera/libcameraservice/CameraService.h
View File

@@ -76,7 +76,6 @@ private:
void setCameraFree(int cameraId); void setCameraFree(int cameraId);
// sounds // sounds
audio_stream_type_t mAudioStreamType;
MediaPlayer* newMediaPlayer(const char *file); MediaPlayer* newMediaPlayer(const char *file);
Mutex mSoundLock; Mutex mSoundLock;