Merge 'Apply new attribute API of libmm-common' patch into 'tizen_dev' for gbs build.

- Remove dependency of mm_attrs_private.h.
- Use new API set in mm_attrs.h instead of those.

Change-Id: Iae2da96589961d6ed0740903d2317d9ead53b552
Signed-off-by: Sangchul Lee <sc11.lee@samsung.com>

diff --git a/src/include/mm_wfd_sink_attrs.h b/src/include/mm_wfd_sink_attrs.h
index 9fdf484..cfa5067 100644 (file)
--- a/src/include/mm_wfd_sink_attrs.h
+++ b/src/include/mm_wfd_sink_attrs.h
@@ -28,7 +28,6 @@
 #include <mm_message.h>
 #include <mm_error.h>
 #include <mm_types.h>
-#include <mm_attrs_private.h>
 #include <mm_attrs.h>
 #include <mm_debug.h>
 

diff --git a/src/mm_wfd_sink_attrs.c b/src/mm_wfd_sink_attrs.c
index 592faa9..6ff80f7 100644 (file)
--- a/src/mm_wfd_sink_attrs.c
+++ b/src/mm_wfd_sink_attrs.c
@@ -38,9 +38,10 @@ MMHandleType
 _mmwfd_construct_attribute(MMHandleType handle)
 {
        int idx = 0;
-       MMHandleType attrs = 0;
+       MMHandleType attrs = NULL;
        int num_of_attrs = 0;
-       mmf_attrs_construct_info_t *base = NULL;
+       MMAttrsConstructInfo *base = NULL;
+       int ret = MM_ERROR_NONE;
 
        debug_fenter();
 
@@ -362,7 +363,7 @@ _mmwfd_construct_attribute(MMHandleType handle)
 
        num_of_attrs = ARRAY_SIZE(wfd_attrs);
 
-       base = (mmf_attrs_construct_info_t *)malloc(num_of_attrs * sizeof(mmf_attrs_construct_info_t));
+       base = (MMAttrsConstructInfo *)malloc(num_of_attrs * sizeof(MMAttrsConstructInfo));
 
        if (!base) {
                debug_error("Cannot create mmwfd attribute\n");
@@ -377,19 +378,19 @@ _mmwfd_construct_attribute(MMHandleType handle)
                base[idx].default_value = wfd_attrs[idx].default_value;
        }
 
-       attrs = mmf_attrs_new_from_data(
-                                       "mmwfd_attrs",
+       ret = mm_attrs_new(
                                        base,
                                        num_of_attrs,
+                                       "mmwfd_attrs",
                                        NULL,
-                                       NULL);
+                                       NULL, &attrs);
 
        if (base) {
                g_free(base);
                base = NULL;
        }
 
-       if (!attrs) {
+       if (ret != MM_ERROR_NONE) {
                debug_error("Cannot create mmwfd attribute\n");
                goto ERROR;
        }
@@ -398,8 +399,8 @@ _mmwfd_construct_attribute(MMHandleType handle)
        for (idx = 0; idx < num_of_attrs; idx++) {
                switch (wfd_attrs[idx].valid_type) {
                case MM_ATTRS_VALID_TYPE_INT_RANGE: {
-                               mmf_attrs_set_valid_type(attrs, idx, MM_ATTRS_VALID_TYPE_INT_RANGE);
-                               mmf_attrs_set_valid_range(attrs, idx,
+                               mm_attrs_set_valid_type(attrs, idx, MM_ATTRS_VALID_TYPE_INT_RANGE);
+                               mm_attrs_set_valid_range(attrs, idx,
                                                                        wfd_attrs[idx].value_min,
                                                                        wfd_attrs[idx].value_max,
                                                                        (int)wfd_attrs[idx].default_value);
@@ -432,7 +433,7 @@ _mmwfd_deconstruct_attribute(MMHandleType handle)
        return_if_fail(handle);
 
        if (handle)
-               mmf_attrs_free(handle);
+               mm_attrs_free(handle);
 
        debug_fleave();
 }