[0.6.147] Apply new attribute API of libmm-common

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

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

diff --git a/packaging/libmm-player.spec b/packaging/libmm-player.spec
index 2552b23..4f563ae 100644 (file)
--- a/packaging/libmm-player.spec
+++ b/packaging/libmm-player.spec
@@ -1,6 +1,6 @@
 Name:       libmm-player
 Summary:    Multimedia Framework Player Library
-Version:    0.6.146
+Version:    0.6.147
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0

diff --git a/src/mm_player_attrs.c b/src/mm_player_attrs.c
index 3eb51a3..327cb60 100644 (file)
--- a/src/mm_player_attrs.c
+++ b/src/mm_player_attrs.c
@@ -26,7 +26,6 @@
 |                                                                                                                                                                                      |
 ========================================================================================== */
 #include <dlog.h>
-#include <mm_attrs_private.h>
 #include <mm_attrs.h>
 #include "mm_player_utils.h"
 #include "mm_player_priv.h"
@@ -228,10 +227,11 @@ __mmplayer_apply_attribute(MMHandleType handle, const char *attribute_name)
 MMHandleType
 _mmplayer_construct_attribute(MMHandleType handle)
 {
+       int result = MM_ERROR_NONE;
        int idx = 0;
        MMHandleType attrs = 0;
        int num_of_attrs = 0;
-       mmf_attrs_construct_info_t *base = NULL;
+       MMAttrsConstructInfo *base = NULL;
 
        MMPLAYER_RETURN_VAL_IF_FAIL(handle, 0);
 
@@ -741,7 +741,7 @@ _mmplayer_construct_attribute(MMHandleType handle)
 
        num_of_attrs = ARRAY_SIZE(player_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) {
                LOGE("failed to alloc attrs constructor");
@@ -756,17 +756,13 @@ _mmplayer_construct_attribute(MMHandleType handle)
                base[idx].default_value = player_attrs[idx].default_value;
        }
 
-       attrs = mmf_attrs_new_from_data(
-                                       "mmplayer_attrs",
-                                       base,
-                                       num_of_attrs,
-                                       NULL,
-                                       NULL);
+       result = mm_attrs_new(base, num_of_attrs, "mmplayer_attrs",
+                                                       NULL, NULL, &attrs);
 
        /* clean */
        MMPLAYER_FREEIF(base);
 
-       if (!attrs) {
+       if (result) {
                LOGE("failed to create player attrs");
                return 0;
        }
@@ -776,8 +772,8 @@ _mmplayer_construct_attribute(MMHandleType handle)
                switch (player_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,
                                        player_attrs[idx].value_min,
                                        player_attrs[idx].value_max,
                                        (int)(intptr_t)(player_attrs[idx].default_value));
@@ -793,9 +789,9 @@ _mmplayer_construct_attribute(MMHandleType handle)
        }
 
        /* commit */
-       if (mmf_attrs_commit(attrs)) {
+       if (mm_attrs_commit_all(attrs)) {
                LOGE("failed to update attributes\n");
-               mmf_attrs_free(attrs);
+               mm_attrs_free(attrs);
                return 0;
        }
 
@@ -810,7 +806,7 @@ _mmplayer_deconstruct_attribute(MMHandleType handle) // @
        MMPLAYER_RETURN_VAL_IF_FAIL(player, FALSE);
 
        if (player->attrs) {
-               mmf_attrs_free(player->attrs);
+               mm_attrs_free(player->attrs);
                player->attrs = 0;
        }
 

diff --git a/src/mm_player_gst.c b/src/mm_player_gst.c
index 597b74e..7a165ba 100644 (file)
--- a/src/mm_player_gst.c
+++ b/src/mm_player_gst.c
@@ -27,7 +27,6 @@
 ========================================================================================== */
 #include <dlog.h>
 #include <mm_error.h>
-#include <mm_attrs_private.h>
 #include <gst/app/gstappsrc.h>
 
 #include "mm_player_gst.h"
@@ -940,7 +939,7 @@ if (gst_tag_list_get_double(tag_list, gsttag, &v_double)) {\
                }
        }
 
-       if (mmf_attrs_commit(attrs))
+       if (mm_attrs_commit_all(attrs))
                LOGE("failed to commit.\n");
 
        gst_tag_list_free(tag_list);
@@ -1838,7 +1837,7 @@ __mmplayer_gst_handle_element_message(mm_player_t* player, GstMessage *msg)
                                MMPLAYER_SUBTITLE_INFO_LOCK(player);
                                player->subtitle_language_list = (GList *)g_value_get_pointer(lang_list);
                                mm_attrs_set_int_by_name(attrs, "content_text_track_num", (gint)count);
-                               if (mmf_attrs_commit(attrs))
+                               if (mm_attrs_commit_all(attrs))
                                        LOGE("failed to commit.\n");
                                LOGD("Total subtitle tracks = %d \n", count);
 
@@ -1905,7 +1904,7 @@ __mmplayer_gst_handle_element_message(mm_player_t* player, GstMessage *msg)
                        }
                }
 
-               if (mmf_attrs_commit(attrs))
+               if (mm_attrs_commit_all(attrs))
                        LOGE("failed to commit.\n");
        }
 
@@ -3768,7 +3767,7 @@ int __mmplayer_gst_build_es_pipeline(mm_player_t* player)
        SECURE_LOGD("uri : %s", player->profile.uri);
 
        mm_attrs_set_int_by_name(attrs, "profile_prepare_async", TRUE);
-       if (mmf_attrs_commit(attrs)) /* return -1 if error */
+       if (mm_attrs_commit_all(attrs)) /* return -1 if error */
                LOGE("failed to commit");
 
        if (player->v_stream_caps && !__mmplayer_gst_create_es_path(player, MM_PLAYER_STREAM_TYPE_VIDEO, player->v_stream_caps))

diff --git a/src/mm_player_priv.c b/src/mm_player_priv.c
index 6822aa7..6112ef7 100644 (file)
--- a/src/mm_player_priv.c
+++ b/src/mm_player_priv.c
@@ -38,7 +38,6 @@
 
 #include <mm_error.h>
 #include <mm_attrs.h>
-#include <mm_attrs_private.h>
 
 #include "mm_player_priv.h"
 #include "mm_player_ini.h"
@@ -307,7 +306,7 @@ __mmplayer_update_content_attrs(mm_player_t* player, enum content_attr_flag flag
                has_bitrate = __mmplayer_update_bitrate_attrs(player, attrs);
 
        /* validate all */
-       if (mmf_attrs_commit(attrs)) {
+       if (mm_attrs_commit_all(attrs)) {
                LOGE("failed to update attributes\n");
                return FALSE;
        }
@@ -442,7 +441,7 @@ __mmplayer_set_state(mm_player_t* player, int state)
                                        mm_attrs_set_string_by_name(player->attrs, "content_audio_codec", audio_codec);
 
                                        MMPLAYER_FREEIF(audio_codec);
-                                       if (mmf_attrs_commit(player->attrs))
+                                       if (mm_attrs_commit_all(player->attrs))
                                                LOGE("failed to update attributes\n");
 
                                        LOGD("set audio codec type with caps\n");
@@ -1359,7 +1358,7 @@ static void __mmplayer_set_decode_track_info(mm_player_t* player, MMPlayerTrackT
        attrs = MMPLAYER_GET_ATTRS(player);
        if (attrs) {
                mm_attrs_set_int_by_name(attrs, attr_name, (gint)player->selector[type].total_track_num);
-               if (mmf_attrs_commit(attrs))
+               if (mm_attrs_commit_all(attrs))
                        LOGW("failed to commit attrs.");
        } else {
                LOGW("cannot get content attribute");
@@ -1738,7 +1737,7 @@ ERROR:
                gst_caps_unref(caps);
 
        /* flusing out new attributes */
-       if (mmf_attrs_commit(attrs))
+       if (mm_attrs_commit_all(attrs))
                LOGE("failed to comit attributes");
 
        return;
@@ -6397,7 +6396,7 @@ __mmplayer_get_next_uri(mm_player_t *player)
        player->uri_info.uri_idx = uri_idx;
        mm_attrs_set_string_by_name(player->attrs, "profile_uri", uri);
 
-       if (mmf_attrs_commit(player->attrs)) {
+       if (mm_attrs_commit_all(player->attrs)) {
                LOGE("failed to commit");
                return FALSE;
        }
@@ -6478,7 +6477,7 @@ __mmplayer_verify_gapless_play_path(mm_player_t *player)
                        mm_attrs_set_int_by_name(attrs, "profile_play_count", count);
 
                        /* commit attribute */
-                       if (mmf_attrs_commit(attrs))
+                       if (mm_attrs_commit_all(attrs))
                                LOGE("failed to commit attribute");
                } else if (count != REPEAT_COUNT_INFINITELY) {
                        LOGD("there is no next uri and no repeat");
@@ -6861,7 +6860,7 @@ int _mmplayer_set_uri(MMHandleType hplayer, const char* uri)
        MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
 
        mm_attrs_set_string_by_name(player->attrs, "profile_uri", uri);
-       if (mmf_attrs_commit(player->attrs)) {
+       if (mm_attrs_commit_all(player->attrs)) {
                LOGE("failed to commit the original uri.\n");
                result = MM_ERROR_PLAYER_INTERNAL;
        } else {
@@ -7611,7 +7610,7 @@ __mmplayer_release_misc_post(mm_player_t* player)
                        mm_attrs_set_string_by_name(player->attrs, "profile_uri", original_uri);
                        LOGD("restore original uri = %s\n", original_uri);
 
-                       if (mmf_attrs_commit(player->attrs))
+                       if (mm_attrs_commit_all(player->attrs))
                                LOGE("failed to commit the original uri.\n");
                }
 
@@ -7845,7 +7844,7 @@ int _mmplayer_change_videosink(MMHandleType handle, MMDisplaySurfaceType surface
        LOGD("store display attribute for given surface type(%d)", surface_type);
        mm_attrs_set_int_by_name(player->attrs, "display_surface_type", surface_type);
        mm_attrs_set_data_by_name(player->attrs, "display_overlay", display_overlay, sizeof(display_overlay));
-       if (mmf_attrs_commit(player->attrs)) {
+       if (mm_attrs_commit_all(player->attrs)) {
                LOGE("failed to commit attribute");
                MMPLAYER_FLEAVE();
                return MM_ERROR_PLAYER_INTERNAL;
@@ -8039,7 +8038,7 @@ __mmplayer_change_external_subtitle_language(mm_player_t* player, const char* fi
                goto EXIT;
        } else {
                mm_attrs_set_string_by_name(player->attrs, "subtitle_uri", filepath);
-               if (mmf_attrs_commit(player->attrs)) {
+               if (mm_attrs_commit_all(player->attrs)) {
                        LOGE("failed to commit.\n");
                        goto EXIT;
                }
@@ -8117,7 +8116,7 @@ int _mmplayer_set_external_subtitle_path(MMHandleType hplayer, const char* filep
        if (!player->pipeline) {
                /* IDLE state */
                mm_attrs_set_string_by_name(player->attrs, "subtitle_uri", filepath);
-               if (mmf_attrs_commit(player->attrs)) {
+               if (mm_attrs_commit_all(player->attrs)) {
                        LOGE("failed to commit");       /* subtitle path will not be created */
                        return MM_ERROR_PLAYER_INTERNAL;
                }
@@ -8128,7 +8127,7 @@ int _mmplayer_set_external_subtitle_path(MMHandleType hplayer, const char* filep
 
                if (!__mmplayer_check_subtitle(player)) {
                        mm_attrs_set_string_by_name(player->attrs, "subtitle_uri", filepath);
-                       if (mmf_attrs_commit(player->attrs)) {
+                       if (mm_attrs_commit_all(player->attrs)) {
                                LOGE("failed to commit");
                                return MM_ERROR_PLAYER_INTERNAL;
                        }
@@ -8732,7 +8731,7 @@ int _mmplayer_set_codec_type(MMHandleType hplayer, MMPlayerStreamType stream_typ
        attrs = MMPLAYER_GET_ATTRS(player);
        mm_attrs_set_int_by_name(attrs, attr_name, codec_type);
 
-       if (mmf_attrs_commit(player->attrs)) {
+       if (mm_attrs_commit_all(player->attrs)) {
                LOGE("failed to commit codec_type attributes");
                return MM_ERROR_PLAYER_INTERNAL;
        }

diff --git a/src/mm_player_tracks.c b/src/mm_player_tracks.c
index ca68662..7e8f352 100644 (file)
--- a/src/mm_player_tracks.c
+++ b/src/mm_player_tracks.c
@@ -21,7 +21,6 @@
  */
 #include <dlog.h>
 #include <mm_error.h>
-#include <mm_attrs_private.h>
 #include "mm_player_utils.h"
 #include "mm_player_tracks.h"
 
@@ -359,7 +358,7 @@ void __mmplayer_track_destroy(mm_player_t* player)
                mm_attrs_set_int_by_name(attrs, "content_audio_track_num", 0);
                mm_attrs_set_int_by_name(attrs, "content_text_track_num", 0);
 
-               if (mmf_attrs_commit(attrs))
+               if (mm_attrs_commit_all(attrs))
                        LOGE("failed to commit.\n");
        }