From 588beae4a6cf730146d79eec0900344392f06da1 Mon Sep 17 00:00:00 2001 From: Jaechul Lee Date: Wed, 2 Jun 2021 14:36:41 +0900 Subject: [PATCH] Change path of configuration file [Version] 0.0.9 [Issue Type] Update Change-Id: I8c6673a1678adf4fc4e3cca618cbe521aaa0ba96 Signed-off-by: Jaechul Lee --- packaging/hal-api-audio.spec | 10 +++++----- testcase/parser.cpp | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/packaging/hal-api-audio.spec b/packaging/hal-api-audio.spec index 3d2947e..958b69c 100644 --- a/packaging/hal-api-audio.spec +++ b/packaging/hal-api-audio.spec @@ -1,6 +1,6 @@ Name: hal-api-audio Summary: TIZEN Audio HAL -Version: 0.0.8 +Version: 0.0.9 Release: 0 Group: System/Libraries License: Apache-2.0 @@ -35,12 +35,12 @@ haltests for audio HAL APIs. %prep %setup -q -n %{name}-%{version} -%cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DCMAKE_LIBDIR_PREFIX=%{_libdir} %build -export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE -DSYSCONFDIR=\\\"%{_sysconfdir}\\\"" -export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE" -export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE" +export CFLAGS+=" -DTIZEN_DEBUG_ENABLE -DSYSCONFDIR=\\\"%{_hal_sysconfdir}\\\"" +export CXXFLAGS+=" -DTIZEN_DEBUG_ENABLE -DSYSCONFDIR=\\\"%{_hal_sysconfdir}\\\"" +export FFLAGS+=" -DTIZEN_DEBUG_ENABLE" +%cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DCMAKE_LIBDIR_PREFIX=%{_libdir} make %{?jobs:-j%jobs} diff --git a/testcase/parser.cpp b/testcase/parser.cpp index 608ed3a..e22a950 100644 --- a/testcase/parser.cpp +++ b/testcase/parser.cpp @@ -6,6 +6,8 @@ #include "parser.hh" +#define DEVICE_MAP_FILE SYSCONFDIR"/pulse/device-map.json" + #define DEVICE_FILE_OBJECT "device-files" #define DEVICE_TYPE_PROP_PLAYBACK_DEVICES "playback-devices" #define DEVICE_TYPE_PROP_CAPTURE_DEVICES "capture-devices" @@ -38,7 +40,7 @@ using namespace std; CDeviceMapParser::CDeviceMapParser() : m_json_obj(nullptr), m_json_device_files_obj(nullptr) { - open_json("/etc/pulse/device-map.json"); + open_json(DEVICE_MAP_FILE); } CDeviceMapParser::CDeviceMapParser(const char* map_file) -- 2.34.1