Modify variable names and parameter clearly

Change-Id: I20271728783136388616c78dfa2412ed9ea27d38
Signed-off-by: sungwook79.park <sungwook79.park@samsung.com>

diff --git a/server/ttsd_data.cpp b/server/ttsd_data.cpp
index 1026589..fe36510 100644 (file)
--- a/server/ttsd_data.cpp
+++ b/server/ttsd_data.cpp
@@ -198,7 +198,7 @@ static inline void destroy_speak_data(speak_data_s* speak_data)
 {
        SLOG(LOG_DEBUG, tts_tag(), "[DEBUG] utt(%d), text(%s), lang(%s), vctype(%d) speed(%d)",
                 speak_data->utt_id, speak_data->text, speak_data->voice.language, speak_data->voice.type,
-                speak_data->parameter.speed);
+                speak_data->synth_parameter.speed);
 
        free(speak_data->text);
        speak_data->text = nullptr;
@@ -497,10 +497,10 @@ speak_data_s* ttsd_data_create_speak_data(const char* text, const char* language
        speak_data->voice.ptts_id = nullptr;
        speak_data->voice.type = voice_type;
 
-       speak_data->parameter.speed = speed;
-       speak_data->parameter.pitch = 0;
-       speak_data->parameter.volume = -1.0;
-       speak_data->parameter.bg_volume = -1.0;
+       speak_data->synth_parameter.speed = speed;
+       speak_data->synth_parameter.pitch = 0;
+       speak_data->synth_parameter.volume = -1.0;
+       speak_data->synth_parameter.background_volume_ratio = -1.0;
        speak_data->utt_id = utt_id;
 
        return speak_data;
@@ -536,7 +536,7 @@ int ttsd_data_add_speak_data(unsigned int uid, speak_data_s* data)
        }
 
        SLOG(LOG_ERROR, tts_tag(), "[DATA][%p] utt_id(%d), text(%s), lang(%s), vctype(%d), speed(%d)",
-                data, data->utt_id, data->text, data->voice.language, data->voice.type, data->parameter.speed);
+                data, data->utt_id, data->text, data->voice.language, data->voice.type, data->synth_parameter.speed);
 
        if (1 == data->utt_id)
                app_data->utt_id_stopped = 0;
@@ -994,7 +994,7 @@ int ttsd_data_save_error_log(unsigned int uid, FILE* fp)
        i = 0;
        for (auto& speakData : app_data->m_speak_data) {
                SLOG(LOG_DEBUG, tts_tag(), "[%dth][%p] lang(%s), vctype(%d), speed(%d), uttid(%d), text(%s)",
-                        i, speakData, speakData->voice.language, speakData->voice.type, speakData->parameter.speed,
+                        i, speakData, speakData->voice.language, speakData->voice.type, speakData->synth_parameter.speed,
                         speakData->utt_id, speakData->text);
                i++;
        }

diff --git a/server/ttsd_data.h b/server/ttsd_data.h
index 80dade9..8611013 100644 (file)
--- a/server/ttsd_data.h
+++ b/server/ttsd_data.h
@@ -47,14 +47,14 @@ typedef struct {
        int speed;
        int pitch;
        double volume;
-       double bg_volume;
+       double background_volume_ratio;
 } synthesis_parameter_s;
 
 typedef struct {
        int utt_id;
        char* text;
        voice_s voice;
-       synthesis_parameter_s parameter;
+       synthesis_parameter_s synth_parameter;
 } speak_data_s;
 
 typedef struct {

diff --git a/server/ttsd_server.c b/server/ttsd_server.c
index 1bdefeb..3354ec3 100644 (file)
--- a/server/ttsd_server.c
+++ b/server/ttsd_server.c
@@ -128,7 +128,7 @@ static void write_debugger_information(speak_data_s *speak_data, const char *app
        } else {
                char value_buffer[2048] = {0, };
                snprintf(value_buffer, 2048, "client=%s|type=%d|speed=%d|language=%s|text=%s|error=%d", appid, temp_type,
-                                speak_data->parameter.speed, temp_lang, speak_data->text, ret);
+                                speak_data->synth_parameter.speed, temp_lang, speak_data->text, ret);
 
                SLOG(LOG_INFO, tts_tag(), "keyVal : %s", value_buffer);
 
@@ -182,14 +182,14 @@ static void __synthesis(unsigned int uid)
        SLOG(LOG_INFO, tts_tag(), "-----------------------------------------------------------");
        SLOG(LOG_INFO, tts_tag(), "ID : uid (%u), uttid(%d) ", g_utt.uid, g_utt.uttid);
        SLOG(LOG_INFO, tts_tag(), "Voice : language(%s), type(%d), speed(%d)", speak_data->voice.language,
-                speak_data->voice.type, speak_data->parameter.speed);
+                speak_data->voice.type, speak_data->synth_parameter.speed);
        SLOG(LOG_INFO, tts_tag(), "Text : %s", speak_data->text);
        SLOG(LOG_INFO, tts_tag(), "Credential : %s", credential);
        SLOG(LOG_INFO, tts_tag(), "-----------------------------------------------------------");
 
        ttsd_data_set_synth_control(TTSD_SYNTHESIS_CONTROL_DOING);
        ret = ttsd_engine_start_synthesis(speak_data->voice.language, speak_data->voice.type, speak_data->text,
-                                                                         speak_data->parameter.speed, appid, credential, NULL);
+                                                                         speak_data->synth_parameter.speed, appid, credential, NULL);
        if (TTSD_ERROR_NONE != ret) {
                SLOG(LOG_ERROR, tts_tag(), "[Server ERROR] * FAIL to start SYNTHESIS !!!! * ");