Change code not to send msg when media controller server set default values while...

Change-Id: Ifce00a85e7abd2651e4f668b0e4a7351dc4db5ed

diff --git a/packaging/capi-media-controller.spec b/packaging/capi-media-controller.spec
index 7d6b711d7b239fb619ef290f42fb5730b8967aea..2207b52c89d4bee5f9c04c09bcf68c8f66e0592b 100644 (file)
--- a/packaging/capi-media-controller.spec
+++ b/packaging/capi-media-controller.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-controller
 Summary:    A media controller library in Tizen Native API
-Version:    0.2.5
+Version:    0.2.6
 Release:    1
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/media_controller_server.c b/src/media_controller_server.c
index 6764bd338a8de90c07db955efbda11ab6cf0e4b2..a262657e62458937c1504f67ebba6e9606ae26b3 100644 (file)
--- a/src/media_controller_server.c
+++ b/src/media_controller_server.c
@@ -1497,6 +1497,33 @@ int mc_server_set_display_rotation_ability(mc_server_h server, mc_display_rotati
        return MEDIA_CONTROLLER_ERROR_NONE;
 }
 
+static void __set_default_ability_support(mc_server_h server)
+{
+       int ret = MEDIA_CONTROLLER_ERROR_NONE;
+
+       ret = __mc_server_update_ability(server, MC_ABILITY_SUBTITLES, MC_ABILITY_SUPPORTED_NO, TRUE);
+       if (ret != MEDIA_CONTROLLER_ERROR_NONE)
+               mc_error("fail to set subtitles ability [%d]", ret);
+
+       ret = __mc_server_update_ability(server, MC_ABILITY_360_MODE, MC_ABILITY_SUPPORTED_NO, TRUE);
+       if (ret != MEDIA_CONTROLLER_ERROR_NONE)
+               mc_error("fail to set 360 mode ability [%d]", ret);
+
+       ret = __mc_server_update_ability(server, (DISPLAY_MODE_ABILITY + MC_DISPLAY_MODE_LETTER_BOX), MC_ABILITY_SUPPORTED_NO, FALSE);
+       ret = __mc_server_update_ability(server, (DISPLAY_MODE_ABILITY + MC_DISPLAY_MODE_ORIGIN_SIZE), MC_ABILITY_SUPPORTED_NO, FALSE);
+       ret = __mc_server_update_ability(server, (DISPLAY_MODE_ABILITY + MC_DISPLAY_MODE_FULL_SCREEN), MC_ABILITY_SUPPORTED_NO, FALSE);
+       ret = __mc_server_update_ability(server, (DISPLAY_MODE_ABILITY + MC_DISPLAY_MODE_CROPPED_FULL), MC_ABILITY_SUPPORTED_NO, TRUE);
+       if (ret != MEDIA_CONTROLLER_ERROR_NONE)
+               mc_error("fail to set display mode ability [%d]", ret);
+
+       ret = __mc_server_update_ability(server, (DISPLAY_ROTATION_ABILITY + MC_DISPLAY_ROTATION_NONE), MC_ABILITY_SUPPORTED_NO, FALSE);
+       ret = __mc_server_update_ability(server, (DISPLAY_ROTATION_ABILITY + MC_DISPLAY_ROTATION_90), MC_ABILITY_SUPPORTED_NO, FALSE);
+       ret = __mc_server_update_ability(server, (DISPLAY_ROTATION_ABILITY + MC_DISPLAY_ROTATION_180), MC_ABILITY_SUPPORTED_NO, FALSE);
+       ret = __mc_server_update_ability(server, (DISPLAY_ROTATION_ABILITY + MC_DISPLAY_ROTATION_270), MC_ABILITY_SUPPORTED_NO, TRUE);
+       if (ret != MEDIA_CONTROLLER_ERROR_NONE)
+               mc_error("fail to set display rotation ability [%d]", ret);
+}
+
 int mc_server_create(mc_server_h *server)
 {
        int ret = MEDIA_CONTROLLER_ERROR_NONE;
@@ -1517,32 +1544,16 @@ int mc_server_create(mc_server_h *server)
                return ret;
        }
 
-       /* Set default value of a ability to Support No. Only for added from Tizen 5.5*/
-       ret = mc_server_set_ability_support(mc_server, MC_ABILITY_SUBTITLES, MC_ABILITY_SUPPORTED_NO);
-       if (ret != MEDIA_CONTROLLER_ERROR_NONE)
-               mc_error("fail to set subtitles ability [%d]", ret);
-       ret = mc_server_set_ability_support(mc_server, MC_ABILITY_360_MODE, MC_ABILITY_SUPPORTED_NO);
-       if (ret != MEDIA_CONTROLLER_ERROR_NONE)
-               mc_error("fail to set 360 mode ability [%d]", ret);
-
-       ret = mc_server_set_display_mode_ability(mc_server,
-               MC_DISPLAY_MODE_LETTER_BOX |MC_DISPLAY_MODE_ORIGIN_SIZE | MC_DISPLAY_MODE_FULL_SCREEN | MC_DISPLAY_MODE_CROPPED_FULL, MC_ABILITY_SUPPORTED_NO);
-       if (ret != MEDIA_CONTROLLER_ERROR_NONE)
-               mc_error("fail to set display mode ability [%d]", ret);
-
-       ret = mc_server_set_display_rotation_ability(mc_server,
-               MC_DISPLAY_ROTATION_NONE |MC_DISPLAY_ROTATION_90 | MC_DISPLAY_ROTATION_180 | MC_DISPLAY_ROTATION_270, MC_ABILITY_SUPPORTED_NO);
-       if (ret != MEDIA_CONTROLLER_ERROR_NONE)
-               mc_error("fail to set display rotation ability [%d]", ret);
+       __set_default_ability_support(mc_server);
 
        /* Set default value of display*/
-       ret = mc_server_update_display_mode(mc_server, MC_DISPLAY_MODE_FULL_SCREEN);
+       ret = _mc_db_update_server_attribute(mc_server->server_name, MC_DB_CMD_UPDATE_DISPLAY_MODE, MC_DISPLAY_MODE_FULL_SCREEN);
        if (ret != MEDIA_CONTROLLER_ERROR_NONE)
-               mc_error("fail to mc_server_update_display_mode [%d]", ret);
+               mc_error("fail to set display mode [%d]", ret);
 
-       ret = mc_server_update_display_rotation(mc_server, MC_DISPLAY_ROTATION_NONE);
+       ret = _mc_db_update_server_attribute(mc_server->server_name, MC_DB_CMD_UPDATE_DISPLAY_ROTATION, MC_DISPLAY_ROTATION_NONE);
        if (ret != MEDIA_CONTROLLER_ERROR_NONE)
-               mc_error("fail to mc_server_update_display_rotation [%d]", ret);
+               mc_error("fail to set display rotation [%d]", ret);
 
        ret = __mc_server_send_message(mc_server, MC_DBUS_UPDATE_INTERFACE, MC_DBUS_SIGNAL_NAME_SERVER_STATE, MC_SERVER_STATE_ACTIVATE, 0, NULL);
        if (ret != MEDIA_CONTROLLER_ERROR_NONE)