From: Wonnam Jang Date: Thu, 21 Feb 2019 07:10:17 +0000 (+0900) Subject: Remove far field package X-Git-Tag: submit/tizen/20190221.072433^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=025197c2bd58336a3be24fefe01cfae3923c320c;p=platform%2Fcore%2Fuifw%2Fvoice-control.git Remove far field package Change-Id: I1e5c4aaa5bf5151e50cc2bdadaef6d8474e8f79c Signed-off-by: Wonnam Jang --- diff --git a/CMakeLists.txt b/CMakeLists.txt index ffeca96..7a6f5ed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,7 +46,8 @@ INCLUDE(FindPkgConfig) IF("${_TV_PRODUCT}" STREQUAL "TRUE") pkg_check_modules(pkgs REQUIRED aul capi-appfw-app-control capi-appfw-app-manager capi-base-common capi-media-audio-io capi-media-sound-manager ecore-wayland - capi-network-bluetooth capi-network-bluetooth-tv capi-system-info cynara-client cynara-session dbus-1 db-util dlog ecore glib-2.0 json-glib-1.0 libgum libtzplatform-config libxml-2.0 sqlite3 vconf msfapi farfield-voice-api + capi-network-bluetooth capi-network-bluetooth-tv capi-system-info cynara-client cynara-session dbus-1 db-util dlog ecore glib-2.0 json-glib-1.0 libgum libtzplatform-config libxml-2.0 sqlite3 vconf msfapi +#farfield-voice-api ) ELSE() pkg_check_modules(pkgs REQUIRED diff --git a/packaging/voice-control.spec b/packaging/voice-control.spec index 1115948..5eeb57e 100644 --- a/packaging/voice-control.spec +++ b/packaging/voice-control.spec @@ -36,7 +36,7 @@ BuildRequires: pkgconfig(pkgmgr-installer) BuildRequires: pkgconfig(capi-network-bluetooth) BuildRequires: pkgconfig(capi-network-bluetooth-tv) BuildRequires: pkgconfig(msfapi) -BuildRequires: pkgconfig(farfield-voice-api) +#BuildRequires: pkgconfig(farfield-voice-api) %endif BuildRequires: pkgconfig(vconf) BuildRequires: cmake diff --git a/server/vcd_recorder.c b/server/vcd_recorder.c index d1c3329..8f69004 100644 --- a/server/vcd_recorder.c +++ b/server/vcd_recorder.c @@ -17,7 +17,7 @@ #ifdef TV_PRODUCT #define TV_BT_MODE #define TV_MSF_WIFI_MODE -#define TV_FFV_MODE +//#define TV_FFV_MODE #endif #include @@ -451,13 +451,11 @@ int vcd_recorder_create(vcd_recoder_audio_cb audio_cb, vcd_recorder_interrupt_cb #ifdef TV_FFV_MODE g_farfieldvoice_h = farfield_voice_init(); - if (NULL == g_farfieldvoice_h) - { + if (NULL == g_farfieldvoice_h) { SLOG(LOG_ERROR, TAG_VCD, "[Recorder ERROR] Fail to init farfield_voice_init"); } - if (g_farfieldvoice_h) - { + if (g_farfieldvoice_h) { farfield_voice_register_audio_cb(g_farfieldvoice_h, _ffv_audio_function_cb, NULL); } #endif @@ -534,8 +532,7 @@ int vcd_recorder_destroy() SLOG(LOG_ERROR, TAG_VCD, "[Recorder ERROR] Fail to audio in destroy, ret(%d)", ret); #ifdef TV_FFV_MODE - if (NULL != g_farfieldvoice_h) - { + if (NULL != g_farfieldvoice_h) { farfield_voice_unregister_audio_cb(g_farfieldvoice_h); farfield_voice_final(g_farfieldvoice_h); g_farfieldvoice_h = NULL;