fix return value error player_set_progressive_download_message_cb 22/51922/1
authorHyongtaek Lim <hyongtaek.lim@samsung.com>
Tue, 17 Nov 2015 09:19:08 +0000 (18:19 +0900)
committerHyongtaek Lim <hyongtaek.lim@samsung.com>
Tue, 17 Nov 2015 09:19:39 +0000 (18:19 +0900)
Signed-off-by: Hyongtaek Lim <hyongtaek.lim@samsung.com>
Change-Id: I0dd305d2a5d72b5e9f79dd234d6c0fde5af1e1ba

client/src/player2.c
src/player_msg_dispatcher.c

index 1908c02..199e65a 100644 (file)
@@ -2656,13 +2656,50 @@ int player_set_progressive_download_message_cb(player_h player,
                player_pd_message_cb callback,
                void *user_data)
 {
-       return __set_callback(_PLAYER_EVENT_TYPE_PD, player, callback,
-                       user_data);
+       PLAYER_INSTANCE_CHECK(player);
+       PLAYER_NULL_ARG_CHECK(callback);
+       int ret = PLAYER_ERROR_NONE;
+       player_cli_s *pc = (player_cli_s *) player;
+       muse_player_api_e api = MUSE_PLAYER_API_SET_CALLBACK;
+       char *ret_buf = NULL;
+       _player_event_e type = _PLAYER_EVENT_TYPE_PD;
+       int set = 1;
+
+       LOGD("ENTER");
+
+       player_msg_send2(api, pc, ret_buf, ret,
+                       INT, type, INT, set);
+
+       if(ret == PLAYER_ERROR_NONE){
+               pc->cb_info->user_cb[type] = callback;
+               pc->cb_info->user_data[type] = user_data;
+               LOGI("Event type : %d ", type);
+       }
+
+       g_free(ret_buf);
+       return ret;
 }
 
 int player_unset_progressive_download_message_cb(player_h player)
 {
-       return __unset_callback(_PLAYER_EVENT_TYPE_PD, player);
+       PLAYER_INSTANCE_CHECK(player);
+       int ret = PLAYER_ERROR_NONE;
+       player_cli_s *pc = (player_cli_s *) player;
+       muse_player_api_e api = MUSE_PLAYER_API_SET_CALLBACK;
+       char *ret_buf = NULL;
+       _player_event_e type = _PLAYER_EVENT_TYPE_PD;
+       int set = 0;
+
+       LOGD("ENTER");
+
+       set_null_user_cb_lock(pc->cb_info, type);
+
+       player_msg_send2(api, pc, ret_buf, ret,
+                       INT, type, INT, set);
+
+       g_free(ret_buf);
+       return ret;
+
 }
 
 int player_set_media_packet_video_frame_decoded_cb(player_h player,
index f8056a7..3257ee7 100644 (file)
@@ -451,10 +451,15 @@ static void _set_buffering_cb(player_h player, void *module, bool set)
 
 static void _set_pd_msg_cb(player_h player, void *module, bool set)
 {
+       int ret = PLAYER_ERROR_NONE;
+       muse_player_api_e api = MUSE_PLAYER_API_SET_CALLBACK;
+
        if(set)
-               player_set_progressive_download_message_cb(player, _pd_msg_cb, module);
+               ret = player_set_progressive_download_message_cb(player, _pd_msg_cb, module);
        else
-               player_unset_progressive_download_message_cb(player);
+               ret = player_unset_progressive_download_message_cb(player);
+
+       player_msg_return(api, ret, module);
 }
 
 static void _set_media_packet_video_frame_cb(player_h player,