From 7da1f6851a3062968711e0c051c98bc89f1e7875 Mon Sep 17 00:00:00 2001 From: "sungwook79.park" Date: Thu, 12 Sep 2024 17:17:42 +0900 Subject: [PATCH] Modify callback(name and parameter) and Remove unused return value Change-Id: I397cfe504e372fa3fb954d04d28ec77ef6118d99 Signed-off-by: sungwook79.park --- include/tts.h | 2 -- include/ttse.h | 10 ++++++---- server/ttsd_engine_agent.c | 4 ++-- server/ttsd_engine_agent.h | 2 +- server/ttsd_main.h | 2 +- server/ttsd_server.c | 2 +- server/ttsd_server.h | 2 +- server/ttse.c | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/include/tts.h b/include/tts.h index 0c72554d..5b48c65f 100644 --- a/include/tts.h +++ b/include/tts.h @@ -1338,7 +1338,6 @@ int tts_synthesis_parameter_set_background_volume_ratio(tts_synthesis_parameter_ * otherwise a negative error value * @retval #TTS_ERROR_NONE Successful * @retval #TTS_ERROR_NOT_SUPPORTED TTS NOT supported - * @retval #TTS_ERROR_NOT_SUPPORTED_FEATURE Not supported feature. * @retval #TTS_ERROR_INVALID_PARAMETER Invalid parameter * @retval #TTS_ERROR_INVALID_STATE Invalid state * @retval #TTS_ERROR_OPERATION_FAILED Operation failure @@ -1375,7 +1374,6 @@ int tts_get_volume_range(tts_h tts, int* min, int* max); * otherwise a negative error value * @retval #TTS_ERROR_NONE Successful * @retval #TTS_ERROR_NOT_SUPPORTED TTS NOT supported - * @retval #TTS_ERROR_PERMISSION_DENIED Permission denied * @retval #TTS_ERROR_INVALID_PARAMETER Invalid parameter * @retval #TTS_ERROR_INVALID_STATE Invalid state * @retval #TTS_ERROR_INVALID_VOICE Invalid voice about language, voice type diff --git a/include/ttse.h b/include/ttse.h index cffe6791..fd54f6f6 100755 --- a/include/ttse.h +++ b/include/ttse.h @@ -219,6 +219,7 @@ typedef int (*ttse_set_pitch_cb)(int pitch); * @since_tizen 9.0 * @remarks This callback function is optional and is registered using ttse_set_personal_tts_id_set_cb(). * @param[in] ptts_id The personal tts id +* @param[in] user_data The user data to be passed to the callback function * @return @c 0 on success, * otherwise a negative error value * @retval #TTSE_ERROR_NONE Successful @@ -226,7 +227,7 @@ typedef int (*ttse_set_pitch_cb)(int pitch); * @retval #TTSE_ERROR_INVALID_STATE Not initialized * @retval #TTSE_ERROR_OPERATION_FAILED Operation failure */ -typedef int (*ttse_set_personal_tts_id_cb)(const char* ptts_id); +typedef int (*ttse_personal_tts_id_set_cb)(const char* ptts_id, void* user_data); /** @@ -712,8 +713,9 @@ int ttse_set_activated_mode_changed_cb(ttse_activated_mode_changed_cb callback); /** * @brief Sets a callback function to be called when a personal TTS id is set. * @since_tizen 9.0 -* @remarks The ttse_set_personal_tts_id_cb() function is called when the engine service user sends the ptts_id. +* @remarks The ttse_personal_tts_id_set_cb() function is called when the engine service user sends the ptts_id. * @param[in] callback ttse_set_personal_tts_id event callback function +* @param[in] user_data The user data passed from engine * @return @c 0 on success, * otherwise a negative error value * @retval #TTSE_ERROR_NONE Successful @@ -721,9 +723,9 @@ int ttse_set_activated_mode_changed_cb(ttse_activated_mode_changed_cb callback); * @retval #TTSE_ERROR_INVALID_PARAMETER Invalid parameter * @retval #TTSE_ERROR_INVALID_STATE Not initialized * @pre The ttse_main() function should be invoked before this function is called. -* @see ttse_set_personal_tts_id_cb() +* @see ttse_personal_tts_id_set_cb() */ -int ttse_set_personal_tts_id_set_cb(ttse_set_personal_tts_id_cb callback); +int ttse_set_personal_tts_id_set_cb(ttse_personal_tts_id_set_cb callback, void* user_data); /** diff --git a/server/ttsd_engine_agent.c b/server/ttsd_engine_agent.c index 44937d62..1f0d4ce8 100644 --- a/server/ttsd_engine_agent.c +++ b/server/ttsd_engine_agent.c @@ -868,7 +868,7 @@ int ttsd_engine_agent_set_personal_tts_id(const char* ptts_id) return TTSD_ERROR_NOT_SUPPORTED_FEATURE; } - ret = g_engine_info->callbacks->set_personal_tts_id(ptts_id); + ret = g_engine_info->callbacks->set_personal_tts_id(ptts_id, NULL); if (0 != ret) { SLOG(LOG_ERROR, tts_tag(), "[Engine Agent ERROR] Fail to set personal tts id : ptts_id(%s), result(%s)", ptts_id, __ttsd_get_engine_error_code(ret)); @@ -1409,7 +1409,7 @@ int ttsd_engine_agent_set_activated_mode_changed_cb(ttse_activated_mode_changed_ return TTSD_ERROR_NONE; } -int ttsd_engine_agent_set_personal_tts_id_set_cb(ttse_set_personal_tts_id_cb callback) +int ttsd_engine_agent_set_personal_tts_id_set_cb(ttse_personal_tts_id_set_cb callback) { if (false == __is_agent_initialized()) { SLOG(LOG_ERROR, tts_tag(), "[Engine Agent ERROR] Not Initialized"); diff --git a/server/ttsd_engine_agent.h b/server/ttsd_engine_agent.h index fe2bb37e..366ee388 100644 --- a/server/ttsd_engine_agent.h +++ b/server/ttsd_engine_agent.h @@ -40,7 +40,7 @@ int ttsd_engine_agent_load_current_engine(); int ttsd_engine_agent_set_private_data_set_cb(ttse_private_data_set_cb callback); int ttsd_engine_agent_set_private_data_requested_cb(ttse_private_data_requested_cb callback); int ttsd_engine_agent_set_activated_mode_changed_cb(ttse_activated_mode_changed_cb callback); -int ttsd_engine_agent_set_personal_tts_id_set_cb(ttse_set_personal_tts_id_cb callback); +int ttsd_engine_agent_set_personal_tts_id_set_cb(ttse_personal_tts_id_set_cb callback); /** Unload current engine */ int ttsd_engine_agent_unload_current_engine(); diff --git a/server/ttsd_main.h b/server/ttsd_main.h index 7f80001c..68908f97 100644 --- a/server/ttsd_main.h +++ b/server/ttsd_main.h @@ -112,7 +112,7 @@ typedef struct { ttse_private_data_set_cb private_data_set; ttse_private_data_requested_cb private_data_requested; ttse_activated_mode_changed_cb activated_mode_changed; - ttse_set_personal_tts_id_cb set_personal_tts_id; + ttse_personal_tts_id_set_cb set_personal_tts_id; } tts_engine_callback_s; diff --git a/server/ttsd_server.c b/server/ttsd_server.c index 122fe9a3..0fbc0ebd 100644 --- a/server/ttsd_server.c +++ b/server/ttsd_server.c @@ -1663,7 +1663,7 @@ int ttsd_set_activated_mode_changed_cb(ttse_activated_mode_changed_cb callback) return ret; } -int ttsd_set_personal_tts_id_set_cb(ttse_set_personal_tts_id_cb callback) +int ttsd_set_personal_tts_id_set_cb(ttse_personal_tts_id_set_cb callback, void* user_data) { int ret = ttsd_engine_agent_set_personal_tts_id_set_cb(callback); if (TTSD_ERROR_NONE != ret) { diff --git a/server/ttsd_server.h b/server/ttsd_server.h index d7d9afed..fbdaf92d 100644 --- a/server/ttsd_server.h +++ b/server/ttsd_server.h @@ -43,7 +43,7 @@ int ttsd_set_private_data_requested_cb(ttse_private_data_requested_cb callback); int ttsd_get_activated_mode(int* activated_mode); int ttsd_set_activated_mode_changed_cb(ttse_activated_mode_changed_cb callback); -int ttsd_set_personal_tts_id_set_cb(ttse_set_personal_tts_id_cb callback); +int ttsd_set_personal_tts_id_set_cb(ttse_personal_tts_id_set_cb callback, void* user_data); int ttsd_send_personal_voice(const char* language, const char* unique_id, const char* display_name, const char* device_name, void* user_data); diff --git a/server/ttse.c b/server/ttse.c index a6bc4a23..996c94b3 100755 --- a/server/ttse.c +++ b/server/ttse.c @@ -365,7 +365,7 @@ int ttse_set_activated_mode_changed_cb(ttse_activated_mode_changed_cb callback) return ret; } -int ttse_set_personal_tts_id_set_cb(ttse_set_personal_tts_id_cb callback) +int ttse_set_personal_tts_id_set_cb(ttse_personal_tts_id_set_cb callback, void* user_data) { if (false == is_feature_enabled()) { return TTSE_ERROR_NOT_SUPPORTED; @@ -381,7 +381,7 @@ int ttse_set_personal_tts_id_set_cb(ttse_set_personal_tts_id_cb callback) return TTSE_ERROR_INVALID_STATE; } - int ret = ttsd_set_personal_tts_id_set_cb(callback); + int ret = ttsd_set_personal_tts_id_set_cb(callback, user_data); if (TTSD_ERROR_NONE != ret) { SLOG(LOG_ERROR, tts_tag(), "[ERROR] Fail to set personal tts id set cb. ret(%d/%s)", ret, get_error_message(ret)); } -- 2.34.1