Rename Android buffer queue GUID for future sink

This change will make it easier to have Android buffer queue as a sink in
the future.  For backwards source code compatibility with beta developers,
retain the old name temporarily.  As soon as they have switched to the
new name, we will remove the old name.

Details:
 - rename XA_IID_ANDROIDBUFFERQUEUE to XA_IID_ANDROIDBUFFERQUEUESOURCE
 - rename SL_IID_ANDROIDBUFFERQUEUE to SL_IID_ANDROIDBUFFERQUEUESOURCE
 - rename MPH_ANDROIDBUFFERQUEUE to MPH_ANDROIDBUFFERQUEUESOURCE
 - did not rename the data locators and interface struct,
   as they can be shared across both source and sink
 - did not rename the member field mAndroidBufferQueue in
   CAudioPlayer / CMediaPlayer as that would be a huge change;
   can do that later if necessary
 - the SINK definition will be added later when needed

Change-Id: I36dc01050efb99d4d7802b2ca2b870f4d978ee21

9 files changed, 13 insertions, 13 deletions

diff --git a/src/MPH.h b/src/MPH.h
index a489ae9..f822390 100644
--- a/src/MPH.h
+++ b/src/MPH.h
@@ -81,7 +81,7 @@
 
 // Android API level 12 extended interfaces
 // GUID and MPH are shared by SL and XA, but currently documented for XA only
-#define MPH_ANDROIDBUFFERQUEUE         50
+#define MPH_ANDROIDBUFFERQUEUESOURCE   50
 
 // OpenMAX AL 1.0.1 interfaces
 #define MPH_XAAUDIODECODERCAPABILITIES   51
diff --git a/src/MPH_to.c b/src/MPH_to.c
index e1fe6c9..638117a 100644
--- a/src/MPH_to.c
+++ b/src/MPH_to.c
@@ -85,7 +85,7 @@ const signed char MPH_to_AudioPlayer[MPH_MAX] = {
     [MPH_ANDROIDEFFECTSEND] = 27,
     [MPH_ANDROIDCONFIGURATION] = 28,
     [MPH_ANDROIDSIMPLEBUFFERQUEUE] = 7,  // alias for [MPH_BUFFERQUEUE]
-    [MPH_ANDROIDBUFFERQUEUE] = 29
+    [MPH_ANDROIDBUFFERQUEUESOURCE] = 29
 #endif
 #else
 #include "MPH_to_AudioPlayer.h"
@@ -255,7 +255,7 @@ const signed char MPH_to_MediaPlayer[MPH_MAX] = {
     [MPH_XASEEK] = 5,
     [MPH_XAPREFETCHSTATUS] = 6,
 #ifdef ANDROID
-    [MPH_ANDROIDBUFFERQUEUE] = 7,
+    [MPH_ANDROIDBUFFERQUEUESOURCE] = 7,
 #endif
 #else
 #include "MPH_to_MediaPlayer.h"
diff --git a/src/OpenSLES_IID.c b/src/OpenSLES_IID.c
index bbcf7dc..95f0599 100644
--- a/src/OpenSLES_IID.c
+++ b/src/OpenSLES_IID.c
@@ -165,7 +165,7 @@ const struct SLInterfaceID_ SL_IID_array[MPH_MAX] = {
 // Android API level 12 extended interfaces
 // GUID and MPH shared by SL and XA, but currently documented for XA only
 
-    // SL_IID_ANDROIDBUFFERQUEUE
+    // SL_IID_ANDROIDBUFFERQUEUESOURCE
     { 0x7fc1a460, 0xeec1, 0x11df, 0xa306, { 0x00, 0x02, 0xa5, 0xd5, 0xc5, 0x1b } },
 
 // OpenMAX AL 1.0.1 interfaces
diff --git a/src/autogen/IID_to_MPH.c b/src/autogen/IID_to_MPH.c
index 1982029..35046ce 100644
--- a/src/autogen/IID_to_MPH.c
+++ b/src/autogen/IID_to_MPH.c
@@ -144,7 +144,7 @@ int IID_to_MPH(const SLInterfaceID iid)
         -1,
         MPH_BUFFERQUEUE,
         -1,
-        MPH_ANDROIDBUFFERQUEUE,
+        MPH_ANDROIDBUFFERQUEUESOURCE,
         MPH_PLAY,
         -1,
         MPH_XAMETADATAINSERTION,
diff --git a/src/classes.c b/src/classes.c
index 5c6c982..bf707bd 100644
--- a/src/classes.c
+++ b/src/classes.c
@@ -89,7 +89,7 @@ static const struct iid_vtable AudioPlayer_interfaces[INTERFACES_AudioPlayer] =
     {MPH_ANDROIDEFFECTSEND, INTERFACE_EXPLICIT, offsetof(CAudioPlayer, mAndroidEffectSend)},
     {MPH_ANDROIDCONFIGURATION, INTERFACE_EXPLICIT_PREREALIZE,
             offsetof(CAudioPlayer, mAndroidConfiguration)},
-    {MPH_ANDROIDBUFFERQUEUE, INTERFACE_EXPLICIT, offsetof(CAudioPlayer, mAndroidBufferQueue)},
+    {MPH_ANDROIDBUFFERQUEUESOURCE, INTERFACE_EXPLICIT, offsetof(CAudioPlayer, mAndroidBufferQueue)},
 #endif
 };
 
@@ -412,7 +412,7 @@ static const struct iid_vtable MediaPlayer_interfaces[INTERFACES_MediaPlayer] =
     {MPH_XASEEK, INTERFACE_EXPLICIT, offsetof(CMediaPlayer, mSeek)},
     {MPH_XAPREFETCHSTATUS, INTERFACE_EXPLICIT, offsetof(CMediaPlayer, mPrefetchStatus)},
 #ifdef ANDROID
-    {MPH_ANDROIDBUFFERQUEUE, INTERFACE_EXPLICIT, offsetof(CMediaPlayer, mAndroidBufferQueue)},
+    {MPH_ANDROIDBUFFERQUEUESOURCE, INTERFACE_EXPLICIT, offsetof(CMediaPlayer, mAndroidBufferQueue)},
 #endif
 };
 
diff --git a/src/interfaces.c b/src/interfaces.c
index 02cbd8e..b0cbd9d 100644
--- a/src/interfaces.c
+++ b/src/interfaces.c
@@ -79,7 +79,7 @@ const char * const interface_names[MPH_MAX] = {
     "ANDROIDSIMPLEBUFFERQUEUE",
 
     // Android API level 12 extended interfaces
-    "ANDROIDBUFFERQUEUE",
+    "ANDROIDBUFFERQUEUESOURCE",
 
     // OpenMAX AL 1.0.1 interfaces
     "XAAUDIODECODERCAPABILITIES",
diff --git a/src/sl_iid.c b/src/sl_iid.c
index 8f2adb0..0207899 100644
--- a/src/sl_iid.c
+++ b/src/sl_iid.c
@@ -80,7 +80,7 @@ const SLInterfaceID SL_IID_ANDROIDSIMPLEBUFFERQUEUE = &SL_IID_array[MPH_ANDROIDS
 
 // Android API level 12 extended interfaces
 // GUID and MPH are shared by SL and XA
-const SLInterfaceID SL_IID_ANDROIDBUFFERQUEUE = &SL_IID_array[MPH_ANDROIDBUFFERQUEUE];
+const SLInterfaceID SL_IID_ANDROIDBUFFERQUEUESOURCE = &SL_IID_array[MPH_ANDROIDBUFFERQUEUESOURCE];
 
 #ifdef __cplusplus
 }
diff --git a/src/sles.c b/src/sles.c
index 49892f7..342ab68 100644
--- a/src/sles.c
+++ b/src/sles.c
@@ -424,8 +424,8 @@ extern bool
     { /* MPH_ANDROIDCONFIGURATION */ IAndroidConfiguration_init, NULL, NULL, NULL, NULL },
     { /* MPH_ANDROIDSIMPLEBUFFERQUEUE */ IBufferQueue_init /* alias */, NULL, NULL, NULL, NULL },
 // Android API level 10 extended interfaces
-    { /* MPH_ANDROIDBUFFERQUEUE */ IAndroidBufferQueue_init, NULL, IAndroidBufferQueue_deinit, NULL,
-        NULL },
+    { /* MPH_ANDROIDBUFFERQUEUESOURCE */ IAndroidBufferQueue_init, NULL, IAndroidBufferQueue_deinit,
+        NULL, NULL },
 // OpenMAX AL 1.0.1 interfaces
     { /* MPH_XAAUDIODECODERCAPABILITIES */ NULL, NULL, NULL, NULL, NULL },
     { /* MPH_XAAUDIOENCODER */ NULL, NULL, NULL, NULL, NULL },
diff --git a/src/xa_iid.c b/src/xa_iid.c
index 0580ef8..0f51ae5 100644
--- a/src/xa_iid.c
+++ b/src/xa_iid.c
@@ -79,8 +79,8 @@ const XAInterfaceID XA_IID_VOLUME = (XAInterfaceID) &SL_IID_array[MPH_XAVOLUME];
 
 // OpenMAX AL 1.0.1 Android API level 12 extended interfaces
 // GUID and MPH are shared by SL and XA
-const XAInterfaceID XA_IID_ANDROIDBUFFERQUEUE =
-        (XAInterfaceID) &SL_IID_array[MPH_ANDROIDBUFFERQUEUE];
+const XAInterfaceID XA_IID_ANDROIDBUFFERQUEUESOURCE =
+        (XAInterfaceID) &SL_IID_array[MPH_ANDROIDBUFFERQUEUESOURCE];
 
 #ifdef __cplusplus
 }