Fix mismatching between enum and method_table

enums should be matched to method_table because the enum is used as an
index.

[Version] 15.0.28
[Issue Type] Bug

Change-Id: I55b3e001ff035ca1983b96efcea3c8e4728f513a
Signed-off-by: Jaechul Lee <jcsing.lee@samsung.com>

diff --git a/packaging/pulseaudio-modules-tizen.spec b/packaging/pulseaudio-modules-tizen.spec
index 48aacf5..b8c2e8a 100644 (file)
--- a/packaging/pulseaudio-modules-tizen.spec
+++ b/packaging/pulseaudio-modules-tizen.spec
@@ -2,7 +2,7 @@
 
 Name:             pulseaudio-modules-tizen
 Summary:          Pulseaudio modules for Tizen
-Version:          15.0.27
+Version:          15.0.28
 Release:          0
 Group:            Multimedia/Audio
 License:          LGPL-2.1+

diff --git a/src/echo-cancel/processor.c b/src/echo-cancel/processor.c
index 8dc6c2d..6670955 100644 (file)
--- a/src/echo-cancel/processor.c
+++ b/src/echo-cancel/processor.c
@@ -492,11 +492,14 @@ pa_processor_method_t pa_processor_get_method(const char *request_method) {
     else if (pa_streq(request_method, "reference_copy"))
         method = PA_PROCESSOR_REFERENCE_COPY;
     else
-        /* request_method could be had 'default' */
-        method = PA_PROCESSOR_METHOD_DEFAULT;
+#ifdef SUPPORT_METHOD_WEBRTC
+        method = PA_PROCESSOR_WEBRTC;
+#else
+        method = PA_PROCESSOR_SPEEX;
+#endif
 
-    pa_log_info("processing method is selected. request_method(%s), method_to_string(%s)",
-                request_method, pa_processor_method_to_string(method));
+    pa_log_info("processing method is selected. method(%d), request_method(%s), method_to_string(%s)",
+                method, request_method, pa_processor_method_to_string(method));
 
     return method;
 }

diff --git a/src/echo-cancel/processor.h b/src/echo-cancel/processor.h
index 625bb25..3e81c22 100644 (file)
--- a/src/echo-cancel/processor.h
+++ b/src/echo-cancel/processor.h
@@ -31,16 +31,14 @@
 #include <pulse/channelmap.h>
 #include <pulse/sample.h>
 
+/* These are used as an index to choose a method in method_table. Keep this order */
 typedef enum {
-    PA_PROCESSOR_ADRIAN,
-    PA_PROCESSOR_REFERENCE_COPY,
     PA_PROCESSOR_SPEEX,
+    PA_PROCESSOR_ADRIAN,
 #ifdef SUPPORT_METHOD_WEBRTC
     PA_PROCESSOR_WEBRTC,
-    PA_PROCESSOR_METHOD_DEFAULT = PA_PROCESSOR_WEBRTC,
-#else
-    PA_PROCESSOR_METHOD_DEFAULT = PA_PROCESSOR_SPEEX,
 #endif
+    PA_PROCESSOR_REFERENCE_COPY,
     PA_PROCESSOR_METHOD_MAX,
 } pa_processor_method_t;