Clean up and Add temporary code for applying new architecture into TV device

Change-Id: I975e49001ffb8782c6601393b42ae678ae20622f
Signed-off-by: Suyeon Hwang <stom.hwang@samsung.com>

diff --git a/audio-manager/src/vc_audio_manager.cpp b/audio-manager/src/vc_audio_manager.cpp
index c595f01047713177f137672d44fdb012fd269478..79cf9810f31a4240451119d6d0b7feb807fe880f 100644 (file)
--- a/audio-manager/src/vc_audio_manager.cpp
+++ b/audio-manager/src/vc_audio_manager.cpp
@@ -135,6 +135,11 @@ int vcd_dependency_initialize(sound_stream_info_h stream_info_h, dependency_audi
 {
        int ret = 0;
 
+       if (nullptr != g_audio_h) {
+               VCAM_LOGE("Already initialized");
+               return VCE_ERROR_INVALID_STATE;
+       }
+
        g_streaming_mode = VC_AUDIO_STREAMING_MODE_VC_SERVICE;
        g_audio_type = VCE_AUDIO_TYPE_PCM_S16_LE;
        g_audio_rate = 16000;
@@ -176,6 +181,12 @@ int vcd_dependency_deinitialize(void)
 {
        VCAM_LOGI("");
        int ret = 0;
+
+       if (nullptr == g_audio_h) {
+               VCAM_LOGE("Not initialized");
+               return VCE_ERROR_INVALID_STATE;
+       }
+
        if (g_is_recording) {
                ret = audio_in_unprepare(g_audio_h);
                if (0 != ret) {
@@ -254,6 +265,11 @@ int vcd_dependency_set_audio_info(sound_stream_info_h stream_info_h, const char*
 
 int vcd_dependency_get_audio_source_type(char** audio_source_type)
 {
+       if (nullptr == g_audio_h) {
+               VCAM_LOGE("[ERROR] g_audio_h is not created");
+               return VCE_ERROR_INVALID_STATE;
+       }
+
        if (nullptr == audio_source_type) {
                VCAM_LOGE("audio_source_type is null");
                return VCE_ERROR_INVALID_PARAMETER;

diff --git a/packaging/voice-control.spec b/packaging/voice-control.spec
index b4c4acc0dadf9b733f0a74e2f9bc4e2517f87fc0..d8e579219e712a4d1fdde974057a6492376726f8 100644 (file)
--- a/packaging/voice-control.spec
+++ b/packaging/voice-control.spec
@@ -120,9 +120,15 @@ export FFLAGS="$FFLAGS -fprofile-arcs -ftest-coverage"
 export LDFLAGS="$LDFLAGS -lgcov"
 %endif
 
+%if "%{tizen_profile_name}" == "tv"
+export CFLAGS="$CFLAGS -DTV_PRODUCT"
+cmake . -DCMAKE_INSTALL_PREFIX=/usr -DLIBDIR=%{_libdir} -DBINDIR=%{_bindir} -DINCLUDEDIR=%{_includedir} \
+        -DTZ_SYS_RO_SHARE=%TZ_SYS_RO_SHARE -D_TV_PRODUCT=TRUE -DTZ_SYS_BIN=%TZ_SYS_BIN -DTZ_SYS_RO_PACKAGES=%TZ_SYS_RO_PACKAGES -DTZ_SYS_RO_APP=%TZ_SYS_RO_APP
+%else
 cmake . -DCMAKE_INSTALL_PREFIX=/usr -DLIBDIR=%{_libdir} -DBINDIR=%{_bindir} -DINCLUDEDIR=%{_includedir} \
         -DTZ_SYS_RO_SHARE=%TZ_SYS_RO_SHARE -DTZ_SYS_BIN=%TZ_SYS_BIN -DTZ_SYS_RO_PACKAGES=%TZ_SYS_RO_PACKAGES -DTZ_SYS_RO_APP=%TZ_SYS_RO_APP
 make %{?jobs:-j%jobs}
+%endif
 
 %if 0%{?gcov:1}
 mkdir -p gcov-obj

diff --git a/server/dependency_audio_manager.h b/server/dependency_audio_manager.h
index 0eb5ebd69c042e51c2011318d94d33c2b8b30940..9568379e85c15ffd1c43e985b00b12e667e79cd1 100644 (file)
--- a/server/dependency_audio_manager.h
+++ b/server/dependency_audio_manager.h
@@ -31,7 +31,11 @@ extern "C" {
  *** Definitions for dependencies
  *************************************************************************************/
 #define VCD_DEPENDENCY_DEFAULT_PATH tzplatform_mkpath(tzplatform_getid("TZ_SYS_RO_SHARE"), "voice/vc/1.0/dependency-audio-manager")
+#ifdef TV_PRODUCT
+#define VCD_DEPENDENCY_DEFAULT_FILENAME "libaudio-manager-vd.so"
+#else
 #define VCD_DEPENDENCY_DEFAULT_FILENAME "libvc-audio-manager.so"
+#endif
 #define VCD_DEPENDENCY_MODULE_PATH "db/voice/vc/dependency_module_path"