commit 24c770c9d328ac5516b488e00c77d6c76d13bcfc
author Glenn Kasten <gkasten@google.com> Tue Jan 17 07:25:53 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 17 07:25:53 2012 -0800
tree 85bcd9d4ee95abdedcea5a2500b747d53faa8b3e
parent 49f944656984a3047e66b2eb625e343841631789
parent 0bfed90f3b312f7c8f2b744efcf62f1992661d6c

Merge "Use audio_stream_type_t consistently"

src/android/AudioPlayer_to_android.cpp

diff --git a/src/android/AudioPlayer_to_android.cpp b/src/android/AudioPlayer_to_android.cpp
index 57db687..437688b 100644
--- a/src/android/AudioPlayer_to_android.cpp
+++ b/src/android/AudioPlayer_to_android.cpp
@@ -462,7 +462,7 @@
     SLresult result = SL_RESULT_SUCCESS;
     SL_LOGV("type %d", type);
 
-    int newStreamType = ANDROID_DEFAULT_OUTPUT_STREAM_TYPE;
+    audio_stream_type_t newStreamType = ANDROID_DEFAULT_OUTPUT_STREAM_TYPE;
     switch(type) {
     case SL_ANDROID_STREAM_VOICE:
         newStreamType = AUDIO_STREAM_VOICE_CALL;

src/android/android_defs.h

diff --git a/src/android/android_defs.h b/src/android/android_defs.h
index 5ac11e1..8519226 100644
--- a/src/android/android_defs.h
+++ b/src/android/android_defs.h
@@ -66,7 +66,7 @@
 #define MPEG2_TS_PACKET_SYNC 0x47
 
 struct AudioPlayback_Parameters {
-    int streamType;
+    audio_stream_type_t streamType;
     int sessionId;
 };
 

src/classes.h

diff --git a/src/classes.h b/src/classes.h
index 3c481ee..7fae631 100644
--- a/src/classes.h
+++ b/src/classes.h
@@ -95,7 +95,7 @@
     /** identifies which group of effects ("session") this player belongs to */
     int mSessionId;
     /** identifies the Android stream type playback will occur on */
-    int mStreamType;
+    audio_stream_type_t mStreamType;
     // FIXME consolidate the next several variables into one class to avoid placement new
     /** plays the PCM data for this player */
     android::sp<android::AudioTrack> mAudioTrack;
@@ -340,6 +340,6 @@
     /** identifies which group of effects ("session") this player belongs to */
     int mSessionId;
     /** identifies the Android stream type playback will occur on */
-    int mStreamType;
+    audio_stream_type_t mStreamType;
 #endif
 } CMediaPlayer;