From 5f5428b1be63c89ab181377e74a5ff1335635761 Mon Sep 17 00:00:00 2001 From: "jiyong.min" Date: Fri, 8 May 2020 13:09:41 +0900 Subject: [PATCH] Fix typo Change-Id: I0ca79d1de21c808610432d9758f7764b1afa09b7 --- src/media_controller_client.c | 90 ++++++++++++------------- src/media_controller_server.c | 56 +++++++-------- test/client_test/media_controller_client_test.c | 2 +- test/server_test/media_controller_server_test.c | 30 ++++----- 4 files changed, 89 insertions(+), 89 deletions(-) diff --git a/src/media_controller_client.c b/src/media_controller_client.c index cc74ffe..f631efa 100644 --- a/src/media_controller_client.c +++ b/src/media_controller_client.c @@ -72,10 +72,10 @@ static mc_cb_event_s cb_event[MC_CLIENT_EVENT_MAX] = { static void __client_server_cb(const char *interface_name, const char *signal_name, const char *message, const char *request_id, void *user_data) { gchar **params = NULL; - media_controller_receiver_s *reciever = (media_controller_receiver_s *)user_data; - mc_retm_if(reciever == NULL, "reciever is NULL"); + media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; + mc_retm_if(receiver == NULL, "receiver is NULL"); - mc_server_state_updated_cb callback = (mc_server_state_updated_cb)reciever->callback; + mc_server_state_updated_cb callback = (mc_server_state_updated_cb)receiver->callback; mc_retm_if(callback == NULL, "server_state_cb is NULL"); mc_retm_if(message == NULL, "message is NULL"); @@ -84,7 +84,7 @@ static void __client_server_cb(const char *interface_name, const char *signal_na params = g_strsplit(message, MC_STRING_DELIMITER, 0); mc_retm_if(params == NULL, "invalid server data"); - callback(params[0], (mc_server_state_e)atoi(params[1]), reciever->user_data); + callback(params[0], (mc_server_state_e)atoi(params[1]), receiver->user_data); g_strfreev(params); } @@ -138,10 +138,10 @@ static void __client_metadata_cb(const char *interface_name, const char *signal_ static void __client_shuffle_cb(const char *interface_name, const char *signal_name, const char *message, const char *request_id, void *user_data) { gchar **params = NULL; - media_controller_receiver_s *reciever = (media_controller_receiver_s *)user_data; - mc_retm_if(reciever == NULL, "reciever is NULL"); + media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; + mc_retm_if(receiver == NULL, "receiver is NULL"); - mc_shuffle_mode_updated_cb callback = (mc_shuffle_mode_updated_cb)reciever->callback; + mc_shuffle_mode_updated_cb callback = (mc_shuffle_mode_updated_cb)receiver->callback; mc_retm_if(callback == NULL, "shuffle_cb is NULL"); mc_retm_if(message == NULL, "message is NULL"); @@ -150,7 +150,7 @@ static void __client_shuffle_cb(const char *interface_name, const char *signal_n params = g_strsplit(message, MC_STRING_DELIMITER, 0); mc_retm_if(params == NULL, "invalid shuffle mode data"); - callback(params[0], (mc_shuffle_mode_e)atoi(params[1]), reciever->user_data); + callback(params[0], (mc_shuffle_mode_e)atoi(params[1]), receiver->user_data); g_strfreev(params); } @@ -158,10 +158,10 @@ static void __client_shuffle_cb(const char *interface_name, const char *signal_n static void __client_repeat_cb(const char *interface_name, const char *signal_name, const char *message, const char *request_id, void *user_data) { gchar **params = NULL; - media_controller_receiver_s *reciever = (media_controller_receiver_s *)user_data; - mc_retm_if(reciever == NULL, "reciever is NULL"); + media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; + mc_retm_if(receiver == NULL, "receiver is NULL"); - mc_repeat_mode_updated_cb callback = (mc_repeat_mode_updated_cb)reciever->callback; + mc_repeat_mode_updated_cb callback = (mc_repeat_mode_updated_cb)receiver->callback; mc_retm_if(callback == NULL, "repeat_cb is NULL"); mc_retm_if(message == NULL, "message is NULL"); @@ -170,7 +170,7 @@ static void __client_repeat_cb(const char *interface_name, const char *signal_na params = g_strsplit(message, MC_STRING_DELIMITER, 0); mc_retm_if(params == NULL, "invalid repeat mode data"); - callback(params[0], (mc_repeat_mode_e)atoi(params[1]), reciever->user_data); + callback(params[0], (mc_repeat_mode_e)atoi(params[1]), receiver->user_data); g_strfreev(params); } @@ -181,10 +181,10 @@ static void __client_playlist_cb(const char *interface_name, const char *signal_ mc_playlist_update_mode_e mode = MC_PLAYLIST_UPDATED; mc_playlist_s *_playlist = NULL; - media_controller_receiver_s *reciever = (media_controller_receiver_s *)user_data; - mc_retm_if(reciever == NULL, "reciever is NULL"); + media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; + mc_retm_if(receiver == NULL, "receiver is NULL"); - mc_playlist_updated_cb callback = (mc_playlist_updated_cb)reciever->callback; + mc_playlist_updated_cb callback = (mc_playlist_updated_cb)receiver->callback; mc_retm_if(callback == NULL, "playlist_cb is NULL"); mc_retm_if(message == NULL, "message is NULL"); @@ -200,7 +200,7 @@ static void __client_playlist_cb(const char *interface_name, const char *signal_ _playlist->server_name = g_strdup(params[0]); _playlist->playlist_name = g_strdup(params[2]); - callback(params[0], mode, params[2], (mc_playlist_h)_playlist, reciever->user_data); + callback(params[0], mode, params[2], (mc_playlist_h)_playlist, receiver->user_data); g_strfreev(params); mc_playlist_destroy((mc_playlist_h)_playlist); @@ -215,10 +215,10 @@ static void __client_cmd_reply_received_cb(const char *interface_name, const cha int enc_size = 0; bundle *bundle_data = NULL; - media_controller_receiver_s *reciever = (media_controller_receiver_s *)user_data; - mc_retm_if(reciever == NULL, "reciever is NULL"); + media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; + mc_retm_if(receiver == NULL, "receiver is NULL"); - mc_cmd_reply_received_cb callback = (mc_cmd_reply_received_cb)reciever->callback; + mc_cmd_reply_received_cb callback = (mc_cmd_reply_received_cb)receiver->callback; mc_retm_if(callback == NULL, "reply_cb is NULL"); mc_retm_if(message == NULL, "message is NULL"); @@ -236,7 +236,7 @@ static void __client_cmd_reply_received_cb(const char *interface_name, const cha if (enc_size > 0) bundle_data = bundle_decode((bundle_raw *)params[3], enc_size); - callback(params[0], request_id, result_code, bundle_data, reciever->user_data); + callback(params[0], request_id, result_code, bundle_data, receiver->user_data); g_strfreev(params); } @@ -250,7 +250,7 @@ static void __client_custom_event_received_cb(const char *interface_name, const bundle *bundle_data = NULL; media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; - mc_retm_if(receiver == NULL, "reciever is NULL"); + mc_retm_if(receiver == NULL, "receiver is NULL"); mc_client_custom_event_received_cb callback = receiver->callback; mc_retm_if(receiver->callback == NULL, "custom_event_received_cb is NULL"); @@ -309,10 +309,10 @@ static void __client_playback_ability_cb(const char *interface_name, const char static void __client_ability_cb(const char *interface_name, const char *signal_name, const char *message, const char *request_id, void *user_data) { gchar **params = NULL; - media_controller_receiver_s *reciever = (media_controller_receiver_s *)user_data; - mc_retm_if(reciever == NULL, "reciever is NULL"); + media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; + mc_retm_if(receiver == NULL, "receiver is NULL"); - mc_shuffle_ability_updated_cb callback = (mc_shuffle_ability_updated_cb)reciever->callback; + mc_shuffle_ability_updated_cb callback = (mc_shuffle_ability_updated_cb)receiver->callback; mc_retm_if(callback == NULL, "callback is NULL"); mc_retm_if(message == NULL, "message is NULL"); @@ -321,7 +321,7 @@ static void __client_ability_cb(const char *interface_name, const char *signal_n params = g_strsplit(message, MC_STRING_DELIMITER, 0); mc_retm_if(params == NULL, "invalid ability data"); - callback(params[0], (mc_ability_support_e)atoi(params[1]), reciever->user_data); + callback(params[0], (mc_ability_support_e)atoi(params[1]), receiver->user_data); g_strfreev(params); } @@ -329,10 +329,10 @@ static void __client_ability_cb(const char *interface_name, const char *signal_n static void __client_ability_support_cb(const char *interface_name, const char *signal_name, const char *message, const char *request_id, void *user_data) { gchar **params = NULL; - media_controller_receiver_s *reciever = (media_controller_receiver_s *)user_data; - mc_retm_if(reciever == NULL, "reciever is NULL"); + media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; + mc_retm_if(receiver == NULL, "receiver is NULL"); - mc_ability_support_updated_cb callback = (mc_ability_support_updated_cb)reciever->callback; + mc_ability_support_updated_cb callback = (mc_ability_support_updated_cb)receiver->callback; mc_retm_if(callback == NULL, "callback is NULL"); mc_retm_if(message == NULL, "message is NULL"); @@ -341,7 +341,7 @@ static void __client_ability_support_cb(const char *interface_name, const char * params = g_strsplit(message, MC_STRING_DELIMITER, 0); mc_retm_if(params == NULL, "invalid ability data"); - callback(params[0], (mc_ability_e)atoi(params[1]), (mc_ability_support_e)atoi(params[2]), reciever->user_data); + callback(params[0], (mc_ability_e)atoi(params[1]), (mc_ability_support_e)atoi(params[2]), receiver->user_data); g_strfreev(params); } @@ -393,10 +393,10 @@ static void __client_display_rotation_ability_cb(const char *interface_name, con static void __client_attribute_cb(const char *interface_name, const char *signal_name, const char *message, const char *request_id, void *user_data) { gchar **params = NULL; - media_controller_receiver_s *reciever = (media_controller_receiver_s *)user_data; - mc_retm_if(!reciever, "Invalid reciever"); + media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; + mc_retm_if(!receiver, "Invalid receiver"); - mc_bool_attribute_updated_cb callback = (mc_bool_attribute_updated_cb)reciever->callback; + mc_bool_attribute_updated_cb callback = (mc_bool_attribute_updated_cb)receiver->callback; mc_retm_if(!callback, "Invalid callback"); mc_retm_if(!message, "Invalid message"); @@ -405,7 +405,7 @@ static void __client_attribute_cb(const char *interface_name, const char *signal params = g_strsplit(message, MC_STRING_DELIMITER, 0); mc_retm_if(params == NULL, "invalid data"); - callback(params[0], atoi(params[1]), reciever->user_data); + callback(params[0], atoi(params[1]), receiver->user_data); g_strfreev(params); } @@ -413,10 +413,10 @@ static void __client_attribute_cb(const char *interface_name, const char *signal static void __client_display_mode_cb(const char *interface_name, const char *signal_name, const char *message, const char *request_id, void *user_data) { gchar **params = NULL; - media_controller_receiver_s *reciever = (media_controller_receiver_s *)user_data; - mc_retm_if(!reciever, "Invalid reciever"); + media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; + mc_retm_if(!receiver, "Invalid receiver"); - mc_display_mode_updated_cb callback = (mc_display_mode_updated_cb)reciever->callback; + mc_display_mode_updated_cb callback = (mc_display_mode_updated_cb)receiver->callback; mc_retm_if(!callback, "Invalid callback"); mc_retm_if(!message, "Invalid message"); @@ -425,7 +425,7 @@ static void __client_display_mode_cb(const char *interface_name, const char *sig params = g_strsplit(message, MC_STRING_DELIMITER, 0); mc_retm_if(params == NULL, "invalid data"); - callback(params[0], (mc_display_mode_e)atoi(params[1]), reciever->user_data); + callback(params[0], (mc_display_mode_e)atoi(params[1]), receiver->user_data); g_strfreev(params); } @@ -433,10 +433,10 @@ static void __client_display_mode_cb(const char *interface_name, const char *sig static void __client_display_rotation_cb(const char *interface_name, const char *signal_name, const char *message, const char *request_id, void *user_data) { gchar **params = NULL; - media_controller_receiver_s *reciever = (media_controller_receiver_s *)user_data; - mc_retm_if(!reciever, "Invalid reciever"); + media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; + mc_retm_if(!receiver, "Invalid receiver"); - mc_display_rotation_updated_cb callback = (mc_display_rotation_updated_cb)reciever->callback; + mc_display_rotation_updated_cb callback = (mc_display_rotation_updated_cb)receiver->callback; mc_retm_if(!callback, "Invalid callback"); mc_retm_if(!message, "Invalid message"); @@ -445,7 +445,7 @@ static void __client_display_rotation_cb(const char *interface_name, const char params = g_strsplit(message, MC_STRING_DELIMITER, 0); mc_retm_if(params == NULL, "invalid data"); - callback(params[0], (mc_display_rotation_e)atoi(params[1]), reciever->user_data); + callback(params[0], (mc_display_rotation_e)atoi(params[1]), receiver->user_data); g_strfreev(params); } @@ -1670,10 +1670,10 @@ static void __client_reply_cb(const char *interface_name, const char *signal_nam int enc_size = 0; bundle *bundle_data = NULL; - media_controller_receiver_s *reciever = (media_controller_receiver_s *)user_data; - mc_retm_if(reciever == NULL, "reciever is NULL"); + media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; + mc_retm_if(receiver == NULL, "receiver is NULL"); - mc_command_reply_received_cb callback = (mc_command_reply_received_cb)reciever->callback; + mc_command_reply_received_cb callback = (mc_command_reply_received_cb)receiver->callback; mc_retm_if(callback == NULL, "reply_cb is NULL"); mc_retm_if(message == NULL, "message is NULL"); @@ -1686,7 +1686,7 @@ static void __client_reply_cb(const char *interface_name, const char *signal_nam if (enc_size > 0) bundle_data = bundle_decode((bundle_raw *)params[3], enc_size); - callback(params[0], atoi(params[1]), bundle_data, reciever->user_data); + callback(params[0], atoi(params[1]), bundle_data, receiver->user_data); g_strfreev(params); } diff --git a/src/media_controller_server.c b/src/media_controller_server.c index ed3ad9e..5460b3b 100644 --- a/src/media_controller_server.c +++ b/src/media_controller_server.c @@ -158,7 +158,7 @@ static void __server_playback_action_cb(const char *interface_name, const char * media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; int value = 0; - mc_retm_if(receiver == NULL, "reciever is NULL"); + mc_retm_if(receiver == NULL, "receiver is NULL"); mc_retm_if(message == NULL, "message is NULL"); mc_server_playback_action_cmd_received_cb callback = receiver->callback; @@ -176,7 +176,7 @@ static void __server_playback_action_cb(const char *interface_name, const char * } if (mc_safe_strtoi(params[1], &value) != MEDIA_CONTROLLER_ERROR_NONE) { - mc_error("Error get recieved value"); + mc_error("Error get received value"); g_strfreev(params); return; } @@ -192,7 +192,7 @@ static void __server_playback_position_cmd_cb(const char *interface_name, const media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; unsigned long long value = 0; - mc_retm_if(receiver == NULL, "reciever is NULL"); + mc_retm_if(receiver == NULL, "receiver is NULL"); mc_retm_if(message == NULL, "message is NULL"); mc_server_playback_position_cmd_received_cb callback = receiver->callback; @@ -210,7 +210,7 @@ static void __server_playback_position_cmd_cb(const char *interface_name, const } if (mc_safe_strtoull(params[1], &value) != MEDIA_CONTROLLER_ERROR_NONE) { - mc_error("Error get recieved value"); + mc_error("Error get received value"); g_strfreev(params); return; } @@ -226,7 +226,7 @@ static void __server_shuffle_mode_cmd_cb(const char *interface_name, const char media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; int value = 0; - mc_retm_if(receiver == NULL, "reciever is NULL"); + mc_retm_if(receiver == NULL, "receiver is NULL"); mc_retm_if(message == NULL, "message is NULL"); mc_server_shuffle_mode_cmd_received_cb callback = receiver->callback; @@ -244,7 +244,7 @@ static void __server_shuffle_mode_cmd_cb(const char *interface_name, const char } if (mc_safe_strtoi(params[1], &value) != MEDIA_CONTROLLER_ERROR_NONE) { - mc_error("Error get recieved value"); + mc_error("Error get received value"); g_strfreev(params); return; } @@ -260,7 +260,7 @@ static void __server_repeat_mode_cmd_cb(const char *interface_name, const char * media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; int value = 0; - mc_retm_if(receiver == NULL, "reciever is NULL"); + mc_retm_if(receiver == NULL, "receiver is NULL"); mc_retm_if(message == NULL, "message is NULL"); mc_server_repeat_mode_cmd_received_cb callback = receiver->callback; @@ -278,7 +278,7 @@ static void __server_repeat_mode_cmd_cb(const char *interface_name, const char * } if (mc_safe_strtoi(params[1], &value) != MEDIA_CONTROLLER_ERROR_NONE) { - mc_error("Error get recieved value"); + mc_error("Error get received value"); g_strfreev(params); return; } @@ -295,7 +295,7 @@ static void __server_play_playlist_cmd_cb(const char *interface_name, const char int action = 0; unsigned long long position = 0; - mc_retm_if(receiver == NULL, "reciever is NULL"); + mc_retm_if(receiver == NULL, "receiver is NULL"); mc_retm_if(message == NULL, "message is NULL"); mc_server_playlist_cmd_received_cb callback = receiver->callback; @@ -313,13 +313,13 @@ static void __server_play_playlist_cmd_cb(const char *interface_name, const char } if (mc_safe_strtoi(params[3], &action) != MEDIA_CONTROLLER_ERROR_NONE) { - mc_error("Error get recieved action value"); + mc_error("Error get received action value"); g_strfreev(params); return; } if (mc_safe_strtoull(params[4], &position) != MEDIA_CONTROLLER_ERROR_NONE) { - mc_error("Error get recieved position value"); + mc_error("Error get received position value"); g_strfreev(params); return; } @@ -338,7 +338,7 @@ static void __server_custom_cmd_cb(const char *interface_name, const char *signa bundle *bundle_data = NULL; media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; - mc_retm_if(receiver == NULL, "reciever is NULL"); + mc_retm_if(receiver == NULL, "receiver is NULL"); mc_retm_if(message == NULL, "message is NULL"); mc_server_custom_cmd_received_cb callback = receiver->callback; @@ -378,13 +378,13 @@ static void __server_event_reply_received_cb(const char *interface_name, const c int result_code = 0; int enc_size = 0; bundle *bundle_data = NULL; - media_controller_receiver_s *reciever = (media_controller_receiver_s *)user_data; + media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; - mc_retm_if(reciever == NULL, "reciever is NULL"); + mc_retm_if(receiver == NULL, "receiver is NULL"); mc_retm_if(message == NULL, "message is NULL"); - mc_cmd_reply_received_cb callback = (mc_cmd_reply_received_cb)reciever->callback; - mc_retm_if(reciever->callback == NULL, "reply_cb is NULL"); + mc_cmd_reply_received_cb callback = (mc_cmd_reply_received_cb)receiver->callback; + mc_retm_if(receiver->callback == NULL, "reply_cb is NULL"); mc_secure_debug("__server_event_reply_received_cb(%s, %s, %s, %s, %p)", interface_name, signal_name, message, request_id, user_data); @@ -400,7 +400,7 @@ static void __server_event_reply_received_cb(const char *interface_name, const c if (enc_size > 0) bundle_data = bundle_decode((bundle_raw *)params[3], enc_size); - callback(params[0], request_id, result_code, bundle_data, reciever->user_data); + callback(params[0], request_id, result_code, bundle_data, receiver->user_data); g_strfreev(params); } @@ -470,7 +470,7 @@ static void __server_search_cmd_cb(const char *interface_name, const char *signa media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; media_controller_search_s *mc_search = NULL; - mc_retm_if(receiver == NULL, "reciever is NULL"); + mc_retm_if(receiver == NULL, "receiver is NULL"); mc_retm_if(message == NULL, "message is NULL"); mc_server_search_cmd_received_cb callback = receiver->callback; @@ -488,7 +488,7 @@ static void __server_search_cmd_cb(const char *interface_name, const char *signa } if (mc_safe_strtoi(params[1], &enc_size) != MEDIA_CONTROLLER_ERROR_NONE) { - mc_error("Error get recieved search cmd"); + mc_error("Error get received search cmd"); g_strfreev(params); return; } @@ -526,7 +526,7 @@ static void __server_enable_cmd_cb(const char *interface_name, const char *signa media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; int value = 0; - mc_retm_if(!receiver, "Invalid reciever"); + mc_retm_if(!receiver, "Invalid receiver"); mc_retm_if(!signal_name, "Invalid signal_name"); mc_retm_if(!message, "Invalid message"); @@ -557,7 +557,7 @@ static void __server_enable_cmd_cb(const char *interface_name, const char *signa } if (mc_safe_strtoi(params[1], &value) != MEDIA_CONTROLLER_ERROR_NONE) { - mc_error("Error get recieved value"); + mc_error("Error get received value"); g_strfreev(params); return; } @@ -573,7 +573,7 @@ static void __server_display_mode_cb(const char *interface_name, const char *sig media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; int value = 0; - mc_retm_if(!receiver, "Invalid reciever"); + mc_retm_if(!receiver, "Invalid receiver"); mc_retm_if(!signal_name, "Invalid signal_name"); mc_retm_if(!message, "Invalid message"); @@ -592,7 +592,7 @@ static void __server_display_mode_cb(const char *interface_name, const char *sig } if (mc_safe_strtoi(params[1], &value) != MEDIA_CONTROLLER_ERROR_NONE) { - mc_error("Error get recieved value"); + mc_error("Error get received value"); g_strfreev(params); return; } @@ -608,7 +608,7 @@ static void __server_display_rotation_cb(const char *interface_name, const char media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; int value = 0; - mc_retm_if(!receiver, "Invalid reciever"); + mc_retm_if(!receiver, "Invalid receiver"); mc_retm_if(!signal_name, "Invalid signal_name"); mc_retm_if(!message, "Invalid message"); @@ -627,7 +627,7 @@ static void __server_display_rotation_cb(const char *interface_name, const char } if (mc_safe_strtoi(params[1], &value) != MEDIA_CONTROLLER_ERROR_NONE) { - mc_error("Error get recieved value"); + mc_error("Error get received value"); g_strfreev(params); return; } @@ -1536,7 +1536,7 @@ static void __server_playback_state_command_cb(const char *interface_name, const media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; int value = 0; - mc_retm_if(receiver == NULL, "reciever is NULL"); + mc_retm_if(receiver == NULL, "receiver is NULL"); mc_retm_if(message == NULL, "message is NULL"); mc_server_playback_state_command_received_cb callback = receiver->callback; @@ -1554,7 +1554,7 @@ static void __server_playback_state_command_cb(const char *interface_name, const } if (mc_safe_strtoi(params[1], &value) != MEDIA_CONTROLLER_ERROR_NONE) { - mc_error("Error get recieved value"); + mc_error("Error get received value"); g_strfreev(params); return; } @@ -1573,7 +1573,7 @@ static void __server_custom_command_cb(const char *interface_name, const char *s bundle *bundle_data = NULL; media_controller_receiver_s *receiver = (media_controller_receiver_s *)user_data; - mc_retm_if(receiver == NULL, "reciever is NULL"); + mc_retm_if(receiver == NULL, "receiver is NULL"); mc_retm_if(message == NULL, "message is NULL"); mc_server_custom_command_received_cb callback = receiver->callback; diff --git a/test/client_test/media_controller_client_test.c b/test/client_test/media_controller_client_test.c index 9af3369..74d7ea5 100755 --- a/test/client_test/media_controller_client_test.c +++ b/test/client_test/media_controller_client_test.c @@ -294,7 +294,7 @@ void _mc_custom_event_received_cb(const char *server_name, const char *request_i if (data) bundle_get_str(data, bundle_key, &bundle_value); - g_print("recieved request_id:[%s] event:[%s] bundle:[%s, %s] from [%s]\n", + g_print("received request_id:[%s] event:[%s] bundle:[%s, %s] from [%s]\n", request_id, event, bundle_key, bundle_value, server_name); bundle *bundle_reply = bundle_create(); diff --git a/test/server_test/media_controller_server_test.c b/test/server_test/media_controller_server_test.c index b83d1c6..81ec54c 100755 --- a/test/server_test/media_controller_server_test.c +++ b/test/server_test/media_controller_server_test.c @@ -160,7 +160,7 @@ static void __get_and_check_metadata(mc_metadata_h metadata) static void __playback_action_received_cb(const char *client_name, const char *request_id, mc_playback_action_e action, void *user_data) { int ret = MEDIA_CONTROLLER_ERROR_NONE; - g_print("[%s] recieved playback action:[%d] from [%s]\n", request_id, action, client_name); + g_print("[%s] received playback action:[%d] from [%s]\n", request_id, action, client_name); if (request_id != NULL) { ret = mc_server_send_cmd_reply(g_mc_server, client_name, request_id, 0, NULL); @@ -172,7 +172,7 @@ static void __playback_action_received_cb(const char *client_name, const char *r static void __playback_position_cmd_received_cb(const char *client_name, const char *request_id, unsigned long long position, void *user_data) { int ret = MEDIA_CONTROLLER_ERROR_NONE; - g_print("[%s] recieved playback position:[%llu] from [%s]\n", request_id, position, client_name); + g_print("[%s] received playback position:[%llu] from [%s]\n", request_id, position, client_name); if (request_id != NULL) { ret = mc_server_send_cmd_reply(g_mc_server, client_name, request_id, 0, NULL); @@ -184,7 +184,7 @@ static void __playback_position_cmd_received_cb(const char *client_name, const c static void __shuffle_mode_cmd_received_cb(const char *client_name, const char *request_id, mc_shuffle_mode_e shuffle_mode, void *user_data) { int ret = MEDIA_CONTROLLER_ERROR_NONE; - g_print("[%s] recieved shuffle mode:[%d] from [%s]\n", request_id, shuffle_mode, client_name); + g_print("[%s] received shuffle mode:[%d] from [%s]\n", request_id, shuffle_mode, client_name); if (request_id != NULL) { ret = mc_server_send_cmd_reply(g_mc_server, client_name, request_id, 0, NULL); @@ -196,7 +196,7 @@ static void __shuffle_mode_cmd_received_cb(const char *client_name, const char * static void __playlist_cmd_received_cb(const char* client_name, const char *request_id, const char *playlist_name, const char *index, mc_playback_action_e action, unsigned long long position, void *user_data) { int ret = MEDIA_CONTROLLER_ERROR_NONE; - g_print("[%s] recieved playlist play : playlist_name[%s] index[%s] action[%d] position[%llu] from [%s]\n", request_id, playlist_name, index, action, position, client_name); + g_print("[%s] received playlist play : playlist_name[%s] index[%s] action[%d] position[%llu] from [%s]\n", request_id, playlist_name, index, action, position, client_name); if (request_id != NULL) { ret = mc_server_send_cmd_reply(g_mc_server, client_name, request_id, 0, NULL); @@ -208,7 +208,7 @@ static void __playlist_cmd_received_cb(const char* client_name, const char *req static void __repeat_mode_cmd_received_cb(const char *client_name, const char *request_id, mc_repeat_mode_e repeat_mode, void *user_data) { int ret = MEDIA_CONTROLLER_ERROR_NONE; - g_print("[%s] recieved repeat mode:[%d] from [%s]\n", request_id, repeat_mode, client_name); + g_print("[%s] received repeat mode:[%d] from [%s]\n", request_id, repeat_mode, client_name); if (request_id != NULL) { ret = mc_server_send_cmd_reply(g_mc_server, client_name, request_id, 0, NULL); @@ -236,7 +236,7 @@ static bool __mc_search_item_cb(mc_content_type_e content_type, mc_search_catego static void __search_cmd_received_cb(const char *client_name, const char *request_id, mc_search_h search, void *user_data) { int ret = MEDIA_CONTROLLER_ERROR_NONE; - g_print("[%s] recieved search cmd from [%s]\n", request_id, client_name); + g_print("[%s] received search cmd from [%s]\n", request_id, client_name); ret = mc_search_foreach_condition(search, __mc_search_item_cb, NULL); @@ -250,7 +250,7 @@ static void __search_cmd_received_cb(const char *client_name, const char *reques static void __subtitles_cmd_received_cb(const char *client_name, const char *request_id, bool enable, void *user_data) { int ret = MEDIA_CONTROLLER_ERROR_NONE; - g_print("[%s] recieved subtitles mode:[%d] from [%s]\n", request_id, enable, client_name); + g_print("[%s] received subtitles mode:[%d] from [%s]\n", request_id, enable, client_name); if (request_id != NULL) { ret = mc_server_send_cmd_reply(g_mc_server, client_name, request_id, 0, NULL); @@ -262,7 +262,7 @@ static void __subtitles_cmd_received_cb(const char *client_name, const char *req static void __display_mode_cmd_received_cb(const char *client_name, const char *request_id, mc_display_mode_e display_mode, void *user_data) { int ret = MEDIA_CONTROLLER_ERROR_NONE; - g_print("[%s] recieved display mode:[%d] from [%s]\n", request_id, display_mode, client_name); + g_print("[%s] received display mode:[%d] from [%s]\n", request_id, display_mode, client_name); if (request_id != NULL) { ret = mc_server_send_cmd_reply(g_mc_server, client_name, request_id, 0, NULL); @@ -274,7 +274,7 @@ static void __display_mode_cmd_received_cb(const char *client_name, const char * static void __display_rotation_cmd_received_cb(const char *client_name, const char *request_id, mc_display_rotation_e display_rotation, void *user_data) { int ret = MEDIA_CONTROLLER_ERROR_NONE; - g_print("[%s] recieved display rotation:[%d] from [%s]\n", request_id, display_rotation, client_name); + g_print("[%s] received display rotation:[%d] from [%s]\n", request_id, display_rotation, client_name); if (request_id != NULL) { ret = mc_server_send_cmd_reply(g_mc_server, client_name, request_id, 0, NULL); @@ -286,7 +286,7 @@ static void __display_rotation_cmd_received_cb(const char *client_name, const ch static void __360_mode_cmd_received_cb(const char *client_name, const char *request_id, bool enable, void *user_data) { int ret = MEDIA_CONTROLLER_ERROR_NONE; - g_print("[%s] recieved 360 mode:[%d] from [%s]\n", request_id, enable, client_name); + g_print("[%s] received 360 mode:[%d] from [%s]\n", request_id, enable, client_name); if (request_id != NULL) { ret = mc_server_send_cmd_reply(g_mc_server, client_name, request_id, 0, NULL); @@ -506,11 +506,11 @@ static void __custom_cmd_received_cb(const char *client_name, const char *reques g_print("No bundle data\n"); } - g_print("recieved request_id:[%s] command:[%s] from [%s]\n", request_id, command, client_name); + g_print("received request_id:[%s] command:[%s] from [%s]\n", request_id, command, client_name); if (bundle_data) - g_print("recieved bundle:[%s] from [%s]\n", bundle_data, client_name); + g_print("received bundle:[%s] from [%s]\n", bundle_data, client_name); else - g_print("recieved bundle:No bundle from [%s]\n", client_name); + g_print("received bundle:No bundle from [%s]\n", client_name); bundle *bundle_reply = bundle_create(); bundle_add_str(bundle_reply, "key1", "result1_2"); @@ -539,10 +539,10 @@ static void __event_reply_received_cb(const char *client_name, const char *reque } if (g_strcmp0(g_request_id, request_id) != 0) { - g_printf("[recieved event reply] wrong request_id: %s \n", request_id); + g_printf("[received event reply] wrong request_id: %s \n", request_id); } - g_print("[recieved event reply] request_id:[%s] result:[%d] bundle:[%s, %s] from [%s] \n", + g_print("[received event reply] request_id:[%s] result:[%d] bundle:[%s, %s] from [%s] \n", request_id, result_code, bundle_key, bundle_value, client_name); } -- 2.7.4