Fix regression in AudioRecorder

Interfaces were out of order

Change-Id: I027dc9d8ed93514d93a5b05063a8711b9841aaf4

3 files changed, 8 insertions, 8 deletions

diff --git a/src/MPH_to.c b/src/MPH_to.c
index c467ba0..070c84e 100644
--- a/src/MPH_to.c
+++ b/src/MPH_to.c
@@ -107,10 +107,10 @@ const signed char MPH_to_AudioRecorder[MPH_MAX] = {
 #ifdef ANDROID
     [MPH_ANDROIDSIMPLEBUFFERQUEUE] = 9, // this is not an alias
     [MPH_ANDROIDCONFIGURATION] = 10,
-#endif
     [MPH_ANDROIDACOUSTICECHOCANCELLATION] = 11,
     [MPH_ANDROIDAUTOMATICGAINCONTROL] = 12,
     [MPH_ANDROIDNOISESUPPRESSION] = 13,
+#endif
 #else
 #include "MPH_to_AudioRecorder.h"
 #endif
diff --git a/src/classes.c b/src/classes.c
index 693ed40..bc96f37 100644
--- a/src/classes.c
+++ b/src/classes.c
@@ -123,15 +123,15 @@ static const struct iid_vtable AudioRecorder_interfaces[INTERFACES_AudioRecorder
     {MPH_EQUALIZER, INTERFACE_DYNAMIC_OPTIONAL, offsetof(CAudioRecorder, mEqualizer)},
     {MPH_VISUALIZATION, INTERFACE_OPTIONAL, offsetof(CAudioRecorder, mVisualization)},
     {MPH_VOLUME, INTERFACE_OPTIONAL, offsetof(CAudioRecorder, mVolume)},
+#ifdef ANDROID
+    {MPH_ANDROIDSIMPLEBUFFERQUEUE, INTERFACE_EXPLICIT, offsetof(CAudioRecorder, mBufferQueue)},
+    {MPH_ANDROIDCONFIGURATION, INTERFACE_EXPLICIT_PREREALIZE,
+            offsetof(CAudioRecorder, mAndroidConfiguration)},
     {MPH_ANDROIDACOUSTICECHOCANCELLATION, INTERFACE_OPTIONAL, offsetof(CAudioRecorder,
                                                               mAcousticEchoCancellation)},
     {MPH_ANDROIDAUTOMATICGAINCONTROL, INTERFACE_OPTIONAL, offsetof(CAudioRecorder,
                                                                    mAutomaticGainControl)},
     {MPH_ANDROIDNOISESUPPRESSION, INTERFACE_OPTIONAL, offsetof(CAudioRecorder, mNoiseSuppression)},
-#ifdef ANDROID
-    {MPH_ANDROIDSIMPLEBUFFERQUEUE, INTERFACE_EXPLICIT, offsetof(CAudioRecorder, mBufferQueue)},
-    {MPH_ANDROIDCONFIGURATION, INTERFACE_EXPLICIT_PREREALIZE,
-            offsetof(CAudioRecorder, mAndroidConfiguration)},
 #endif
 };
 
diff --git a/src/classes.h b/src/classes.h
index 62bcf5d..54ca0e8 100644
--- a/src/classes.h
+++ b/src/classes.h
@@ -134,12 +134,12 @@
     IEqualizer mEqualizer;
     IVisualization mVisualization;
     IVolume mVolume;
-    IAndroidAcousticEchoCancellation  mAcousticEchoCancellation;
-    IAndroidAutomaticGainControl mAutomaticGainControl;
-    IAndroidNoiseSuppression mNoiseSuppression;
 #ifdef ANDROID
     IBufferQueue mBufferQueue;
     IAndroidConfiguration mAndroidConfiguration;
+    IAndroidAcousticEchoCancellation  mAcousticEchoCancellation;
+    IAndroidAutomaticGainControl mAutomaticGainControl;
+    IAndroidNoiseSuppression mNoiseSuppression;
 #endif
     // remaining are per-instance private fields not associated with an interface
     DataLocatorFormat mDataSource;