bug-1007552 : add ENFORCED_AUDIBLE/SYSTEM_ENFORCED stream type for ca…

…mera shutter
littlestar0425 · May 29, 2014 · e1c695d · e1c695d
1 parent a62c357
commit e1c695d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/include/SLES/OpenSLES_AndroidConfiguration.h b/include/SLES/OpenSLES_AndroidConfiguration.h
@@ -63,6 +63,10 @@ extern "C" {
 #define SL_ANDROID_STREAM_ALARM        ((SLint32) 0x00000004)
 /*      same as android.media.AudioManager.STREAM_NOTIFICATION */
 #define SL_ANDROID_STREAM_NOTIFICATION ((SLint32) 0x00000005)
+/*      same as android.media.AudioManager.STREAM_BLUETOOTH_SCO */
+#define SL_ANDROID_STREAM_BLUETOOTH_SCO ((SLint32) 0x00000006)
+/*      same as android.media.AudioManager.STREAM_SYSTEM_ENFORCED */
+#define SL_ANDROID_STREAM_SYSTEM_ENFORCED ((SLint32) 0x00000007)
 
 
 

diff --git a/src/android/AudioPlayer_to_android.cpp b/src/android/AudioPlayer_to_android.cpp
@@ -461,6 +461,9 @@ SLresult audioPlayer_setStreamType(CAudioPlayer* ap, SLint32 type) {
     case SL_ANDROID_STREAM_NOTIFICATION:
         newStreamType = AUDIO_STREAM_NOTIFICATION;
         break;
+    case SL_ANDROID_STREAM_SYSTEM_ENFORCED:
+        newStreamType = AUDIO_STREAM_ENFORCED_AUDIBLE;
+        break;
     default:
         SL_LOGE(ERROR_PLAYERSTREAMTYPE_SET_UNKNOWN_TYPE);
         result = SL_RESULT_PARAMETER_INVALID;