From: Kwanghoon Son <k.son@samsung.com>
Date: Mon, 14 Nov 2022 00:40:30 +0000 (-0500)
Subject: Change init path in hal first
X-Git-Tag: accepted/tizen/7.0/unified/20221117.014343^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=963d780ae8081b76b1ee097015569158ef57de92;p=platform%2Fcore%2Fmultimedia%2Fvision-source.git

Change init path in hal first

[issue type] New

Change-Id: Ia3e6fe2af03651da6faf62120f8190869afe9ee6
Signed-off-by: Kwanghoon Son <k.son@samsung.com>
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4fe430d..d061f3d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,10 @@ pkg_check_modules(${PROJECT_NAME}_DEP REQUIRED dlog iniparser)
 add_library(${PROJECT_NAME} SHARED
     src/vision_source.c
 )
+
+add_compile_definitions(HAL_INI_PATH="${HAL_SYSCONFDIR}/vision_source.ini")
 add_compile_definitions(INI_PATH="${SYSCONF_INSTALL_DIR}/vision_source.ini")
+
 target_compile_options(${PROJECT_NAME} PUBLIC ${${PROJECT_NAME}_DEP_CFLAGS})
 target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_SOURCE_DIR}/include)
 target_link_libraries(${PROJECT_NAME} ${${PROJECT_NAME}_DEP_LIBRARIES} ${CMAKE_DL_LIBS})
diff --git a/packaging/vision-source.spec b/packaging/vision-source.spec
index 45d2eb7..46c6406 100644
--- a/packaging/vision-source.spec
+++ b/packaging/vision-source.spec
@@ -1,6 +1,6 @@
 Name:        vision-source
 Summary:     vision source
-Version:     0.0.8
+Version:     0.0.9
 Release:     0
 Group:       Multimedia/Framework
 License:     Apache-2.0
@@ -29,7 +29,7 @@ export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE"
 export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE"
 %endif
 
-%cmake .
+%cmake -DHAL_SYSCONFDIR=%{_hal_sysconfdir}/multimedia .
 make %{?jobs:-j%jobs}
 
 %install
diff --git a/src/vision_source.c b/src/vision_source.c
index acf2e19..c6fa996 100644
--- a/src/vision_source.c
+++ b/src/vision_source.c
@@ -73,10 +73,17 @@ int _vision_source_attach(const char *backend_name,
 int _vision_source_get_backend(char *name)
 {
 	LOGD("ENTER");
-	dictionary *ini = iniparser_load(INI_PATH);
-	if (ini == NULL) {
-		return VISION_SOURCE_ERROR_INVALID_PARAMETER;
+
+	dictionary *ini = iniparser_load(HAL_INI_PATH);
+	if (!ini) {
+		LOGI("hal ini not exist path : %s", HAL_INI_PATH);
+		ini = iniparser_load(INI_PATH);
+		if (!ini) {
+			LOGE("ini not exist path : %s", INI_PATH);
+			return VISION_SOURCE_ERROR_INVALID_PARAMETER;
+		}
 	}
+
 	const char *backend_name = iniparser_getstring(ini, "common:name", NULL);
 
 	if (backend_name == NULL) {