projects
/
platform
/
core
/
uifw
/
inputdelegator.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix issue detected by static analysis tool
[platform/core/uifw/inputdelegator.git]
/
src
/
w-input-stt-voice.cpp
diff --git
a/src/w-input-stt-voice.cpp
b/src/w-input-stt-voice.cpp
index
4595593
..
3f8e754
100755
(executable)
--- a/
src/w-input-stt-voice.cpp
+++ b/
src/w-input-stt-voice.cpp
@@
-32,6
+32,7
@@
#include "w-input-stt-voice.h"
#include "w-input-stt-engine.h"
#include "w-input-stt-ise.h"
#include "w-input-stt-voice.h"
#include "w-input-stt-engine.h"
#include "w-input-stt-ise.h"
+#include "voice-recorder.h"
using namespace std;
using namespace std;
@@
-473,10
+474,15
@@
static void on_confirm_button_clicked_cb(void *data, Evas_Object *obj, void *eve
PRINTFUNC(DLOG_DEBUG, "result_text = %s", result_text.c_str());
PRINTFUNC(DLOG_DEBUG, "result_text = %s", result_text.c_str());
- reply_to_sender_by_callback(result_text.c_str(), "voice");
+ char *filePath = NULL;
+ voice_recorder *vr = _voice_recorder_get_data();
+ if (!vr)
+ filePath = vr->file_path;
+ char *path[] = {filePath, };
+ reply_to_sender_by_callback(result_text.c_str(), "voice", (const char **)path);
destroy_voice();
powerUnlock();
destroy_voice();
powerUnlock();
-
elm
_exit();
+
ui_app
_exit();
return;
}
return;
}
@@
-563,14
+569,13
@@
static Eina_Bool _idler_cb(void *data)
Evas_Object *canvas = elm_object_part_content_get(voicedata->layout_main, "EFFECT_BG");
is::ui::WInputSttMicEffect *ieffect = new is::ui::WInputSttMicEffect();
Evas_Object *canvas = elm_object_part_content_get(voicedata->layout_main, "EFFECT_BG");
is::ui::WInputSttMicEffect *ieffect = new is::ui::WInputSttMicEffect();
- if (ieffect)
+ if (ieffect)
{
ieffect->SetSttHandle(voicedata->sttmanager->GetSttHandle());
ieffect->SetSttHandle(voicedata->sttmanager->GetSttHandle());
- is::ui::MicEffector *effector = new is::ui::MicEffector(canvas, voicedata->layout_main, *ieffect);
- voicedata->ieffect = ieffect;
- voicedata->effector = effector;
+
is::ui::MicEffector *effector = new is::ui::MicEffector(canvas, voicedata->layout_main, *ieffect);
+
voicedata->ieffect = ieffect;
+
voicedata->effector = effector;
- if (ieffect) {
ieffect->SetProgressBar(voicedata->progressbar);
ieffect->SetSttHandle(voicedata->sttmanager->GetSttHandle());
}
ieffect->SetProgressBar(voicedata->progressbar);
ieffect->SetSttHandle(voicedata->sttmanager->GetSttHandle());
}
@@
-779,6
+784,9
@@
static Eina_Bool _start_timer_cb(void* data)
}
voicedata->start_timer = NULL;
}
}
voicedata->start_timer = NULL;
}
+
+ start_voice_recorder();
+
return ECORE_CALLBACK_CANCEL;
}
return ECORE_CALLBACK_CANCEL;
}
@@
-904,7
+912,8
@@
static char *__get_genlist_title_label(void *data, Evas_Object *obj, const char
char *__get_genlist_item_label(void *data, Evas_Object *obj, const char *part)
{
char *__get_genlist_item_label(void *data, Evas_Object *obj, const char *part)
{
- char text[128] = {0, };
+ const int BUF_LEN = 128;
+ char text[BUF_LEN] = {'\0', };
if(!strcmp(part, "elm.text"))
{
if(!strcmp(part, "elm.text"))
{
@@
-919,10
+928,10
@@
char *__get_genlist_item_label(void *data, Evas_Object *obj, const char *part)
if(p) {
strncpy(text, s, p-s);
} else {
if(p) {
strncpy(text, s, p-s);
} else {
- s
trncpy(text, s, strlen(s)
);
+ s
nprintf(text, BUF_LEN, "%s", s
);
}
} else {
}
} else {
- s
trncpy(text, "", strlen("")
);
+ s
nprintf(text, BUF_LEN, "%s", ""
);
}
}
return strdup(text);
}
}
return strdup(text);
@@
-954,11
+963,10
@@
char *__get_genlist_item_label(void *data, Evas_Object *obj, const char *part)
if(p) {
strncpy(text, p+1, strlen(s)-(p-s)-2);
} else {
if(p) {
strncpy(text, p+1, strlen(s)-(p-s)-2);
} else {
- strncpy(text, s, strlen(s));
- text[strlen(s)] = '\0';
+ snprintf(text, BUF_LEN, "%s", s);
}
} else {
}
} else {
- s
trncpy(text, "", strlen("")
);
+ s
nprintf(text, BUF_LEN, "%s", ""
);
}
return strdup(text);
}
}
return strdup(text);
}
@@
-1324,8
+1332,11
@@
void create_setting_window(Evas_Object *more_option_layout)
*/
genlist = create_language_list(naviframe);
*/
genlist = create_language_list(naviframe);
+ const char *item_style = NULL;
+ if (_WEARABLE)
+ item_style = "empty";
//item = elm_naviframe_item_push(naviframe, "IDS_VC_HEADER_VOICE_INPUT_LANGUAGE", NULL, NULL, genlist, NULL);
//item = elm_naviframe_item_push(naviframe, "IDS_VC_HEADER_VOICE_INPUT_LANGUAGE", NULL, NULL, genlist, NULL);
- elm_naviframe_item_push(naviframe, NULL, NULL, NULL, genlist,
"empty"
);
+ elm_naviframe_item_push(naviframe, NULL, NULL, NULL, genlist,
item_style
);
//elm_object_item_domain_text_translatable_set(item, PACKAGE, EINA_TRUE);
g_setting_window = window;
//elm_object_item_domain_text_translatable_set(item, PACKAGE, EINA_TRUE);
g_setting_window = window;
@@
-1391,6
+1402,8
@@
static Evas_Object *create_text_detiled_view(Evas_Object *parent)
string edj_path = get_resource_path();
if(_WEARABLE)
edj_path = edj_path + STT_EDJ_FILE_WEARABLE;
string edj_path = get_resource_path();
if(_WEARABLE)
edj_path = edj_path + STT_EDJ_FILE_WEARABLE;
+ else if (_TV)
+ edj_path = edj_path + STT_EDJ_FILE_TV;
else
edj_path = edj_path + STT_EDJ_FILE_MOBILE;
//layout
else
edj_path = edj_path + STT_EDJ_FILE_MOBILE;
//layout
@@
-1539,6
+1552,8
@@
static Evas_Object *create_textblock(void* data)
string edj_path = get_resource_path();
if(_WEARABLE)
edj_path = edj_path + STT_EDJ_FILE_WEARABLE;
string edj_path = get_resource_path();
if(_WEARABLE)
edj_path = edj_path + STT_EDJ_FILE_WEARABLE;
+ else if (_TV)
+ edj_path = edj_path + STT_EDJ_FILE_TV;
else
edj_path = edj_path + STT_EDJ_FILE_MOBILE;
else
edj_path = edj_path + STT_EDJ_FILE_MOBILE;
@@
-1646,6
+1661,8
@@
static Evas_Object *create_fullview(Evas_Object *parent, VoiceData *r_voicedata)
string edj_path = get_resource_path();
if(_WEARABLE)
edj_path = edj_path + STT_EDJ_FILE_WEARABLE;
string edj_path = get_resource_path();
if(_WEARABLE)
edj_path = edj_path + STT_EDJ_FILE_WEARABLE;
+ else if (_TV)
+ edj_path = edj_path + STT_EDJ_FILE_TV;
else
edj_path = edj_path + STT_EDJ_FILE_MOBILE;
else
edj_path = edj_path + STT_EDJ_FILE_MOBILE;
@@
-1799,6
+1816,8
@@
int init_voice(Evas_Object *parent, const char *lang, VoiceData *r_voicedata)
voicedata->textblock_timer = NULL;
}
voicedata->textblock_timer = NULL;
}
+ init_voice_recorder(NULL);
+
return TRUE;
}
return TRUE;
}