#include <string>
#include <efl_extension.h>
#include <feedback.h>
+#include <stdint.h>
#include "Debug.h"
#include "w-input-selector.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;
#define GRP_PORTRAIT "mic_control"
#define item_append(obj, style, index, cb, udata) \
- elm_genlist_item_append(obj, &(style), (void *)index, NULL, ELM_GENLIST_ITEM_NONE, cb, udata)
+ elm_genlist_item_append(obj, &(style), (void *)(uintptr_t)index, NULL, ELM_GENLIST_ITEM_NONE, cb, udata)
#define VIRTUAL_TEXT_AREA_FONT_STYLE \
"DEFAULT='font=Tizen:style=Regular font_size=32 color=#FFFFFF color_class=AT013 text_class=tizen wrap=mixed align=center' \
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();
- elm_exit();
+ ui_app_exit();
return;
}
}
voicedata->start_timer = NULL;
}
+
+ start_voice_recorder();
+
return ECORE_CALLBACK_CANCEL;
}
ecore_event_handler_del(g_evt_key_down);
g_evt_key_down = NULL;
-
- //Hide more option
- if(g_more_option_layout){
- if(eext_more_option_opened_get(g_more_option_layout) == EINA_TRUE) {
- eext_more_option_opened_set(g_more_option_layout, EINA_FALSE);
+ if (_WEARABLE) {
+ //Hide more option
+ if(g_more_option_layout){
+ if(eext_more_option_opened_get(g_more_option_layout) == EINA_TRUE) {
+ eext_more_option_opened_set(g_more_option_layout, EINA_FALSE);
+ }
}
}
}
if(!strcmp(part, "elm.text"))
{
- if((int)data == 0) {
+ if((uintptr_t)data == 0) {
return strdup(_("IDS_VC_BODY_AUTOMATIC"));
} else {
char *s = NULL;
- s = (char *)disp_lang_array[(int)data];
+ s = (char *)disp_lang_array[(uintptr_t)data];
if(s) {
char *p = strchr(s, '(');
strncpy(text, s, p-s);
} else {
strncpy(text, s, strlen(s));
+ text[strlen(s)] = '\0';
}
} else {
strncpy(text, "", strlen(""));
}
return strdup(text);
} else if (!strcmp(part, "elm.text.1")) {
- if ((int)data == 0) {
+ if ((uintptr_t)data == 0) {
char* value = NULL;
value = vconf_get_str(VCONFKEY_LANGSET);
if (NULL == value) {
} else {
char *s = NULL;
- s = (char *)disp_lang_array[(int)data];
+ s = (char *)disp_lang_array[(uintptr_t)data];
if(s) {
char *p = strchr(s, '(');
strncpy(text, p+1, strlen(s)-(p-s)-2);
} else {
strncpy(text, s, strlen(s));
+ text[strlen(s)] = '\0';
}
} else {
strncpy(text, "", strlen(""));
Elm_Object_Item * item = (Elm_Object_Item *) event_info;
if (item) {
elm_genlist_item_selected_set(item, 0);
- index = (int)elm_object_item_data_get(item);
+ index = (uintptr_t)elm_object_item_data_get(item);
elm_genlist_item_update(item);
}
set_language_value(index);
itc_title.item_style = "title";
itc_title.func.text_get = __get_genlist_title_label;
itc_title.func.content_get = NULL;
-#ifdef _WEARABLE
- item = elm_genlist_item_append(genlist, &itc_title, (void *)-1, NULL, ELM_GENLIST_ITEM_GROUP, NULL, genlist);
-#endif
+ if (_WEARABLE) {
+ item = elm_genlist_item_append(genlist, &itc_title, (void *)-1, NULL, ELM_GENLIST_ITEM_GROUP, NULL, genlist);
+ }
// 2 line text
-#ifdef _WEARABLE
- itc_2text.item_style = "2text.1icon.1/sub1.multiline";
-#else
- itc_2text.item_style = "type1";
-#endif
+ if (_WEARABLE) {
+ itc_2text.item_style = "2text.1icon.1/sub1.multiline";
+ } else {
+ itc_2text.item_style = "type1";
+ }
itc_2text.func.text_get = __get_genlist_item_label;
itc_2text.func.content_get = __get_genlist_item_content;
}
// 1 line text
-#ifdef _WEARABLE
- itc_1text.item_style = "1text.1icon.1";
-#else
- itc_1text.item_style = "type1";
-#endif
+ if (_WEARABLE) {
+ itc_1text.item_style = "1text.1icon.1";
+ } else {
+ itc_1text.item_style = "type1";
+ }
itc_1text.func.text_get = __get_genlist_item_label;
itc_1text.func.content_get = __get_genlist_item_content;
*/
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);
- 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;
static Evas_Object *create_text_detiled_view(Evas_Object *parent)
{
string edj_path = get_resource_path();
- edj_path = edj_path + STT_EDJ_FILE;
-
+ 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
Evas_Object *layout = elm_layout_add(parent);
elm_layout_file_set(layout, edj_path.c_str(), "entry_focused_layout");
VoiceData *voicedata = (VoiceData *)data;
Evas_Object *scroller = NULL;
- Evas_Object *circle_scroller = NULL;
-
scroller = elm_layout_content_get((Evas_Object *)voicedata->layout_main, "text_area");
- circle_scroller = (Evas_Object *) evas_object_data_get(scroller, "circle");
- eext_rotary_object_event_activated_set(circle_scroller, bActivate);
+ if (_WEARABLE) {
+ Evas_Object *circle_scroller = NULL;
+ circle_scroller = (Evas_Object *) evas_object_data_get(scroller, "circle");
+ eext_rotary_object_event_activated_set(circle_scroller, bActivate);
+ }
}
static Evas_Object *create_textblock(void* data)
Evas_Object *circle_scroller = NULL;
string edj_path = get_resource_path();
- edj_path = edj_path + STT_EDJ_FILE;
+ 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;
scroller = elm_scroller_add(voicedata->layout_main);
elm_scroller_page_scroll_limit_set(scroller, 0, 1);
elm_object_scroll_lock_x_set(scroller, EINA_TRUE);
-
-// uxt_scroller_set_auto_scroll_enabled(scroller, EINA_FALSE);
-
- circle_scroller = eext_circle_object_scroller_add(scroller, app_data->circle_surface);
- eext_circle_object_scroller_policy_set(circle_scroller, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_AUTO);
- eext_rotary_object_event_activated_set(circle_scroller, EINA_TRUE);
-
+ if (_WEARABLE) {
+ circle_scroller = eext_circle_object_scroller_add(scroller, app_data->circle_surface);
+ eext_circle_object_scroller_policy_set(circle_scroller, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_AUTO);
+ eext_rotary_object_event_activated_set(circle_scroller, EINA_TRUE);
+ }
box = elm_box_add(scroller);
inner_layout = elm_layout_add(scroller);
voicedata->layout_main = layout_main;
string edj_path = get_resource_path();
- edj_path = edj_path + STT_EDJ_FILE;
+ 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;
if (vconf_get_bool(VCONFKEY_SETAPPL_ACCESSIBILITY_TTS, &is_screen_reader_on) == -1) {
PRINTFUNC(DLOG_ERROR, "Cannot read value of screen reader from vconf");
voicedata->textblock_timer = NULL;
}
+ init_voice_recorder(NULL);
+
return TRUE;
}
//Hide more option and language settings by interrupt scenario.
close_setting_window_idler_cb(NULL);
Evas_Object *mo_layout = voicedata->mo->getMoreOptionLayout();
- if(mo_layout){
- if(eext_more_option_opened_get(mo_layout) == EINA_TRUE) {
- eext_more_option_opened_set(mo_layout, EINA_FALSE);
+ if (_WEARABLE) {
+ if(mo_layout){
+ if(eext_more_option_opened_get(mo_layout) == EINA_TRUE) {
+ eext_more_option_opened_set(mo_layout, EINA_FALSE);
+ }
}
}
}
projects / platform / core / uifw / inputdelegator.git / blobdiff