stream/device-manager: use PA_DEFAULT_CONFIG_DIR instead of hardcoding for configurat...

[Version] 13.0.63
[Issue Type] New HAL

Change-Id: I9e5072c5db449a699b231275883608a55f77f288

diff --git a/packaging/pulseaudio-modules-tizen.spec b/packaging/pulseaudio-modules-tizen.spec
index 1c4f294..7b3abc2 100644 (file)
--- a/packaging/pulseaudio-modules-tizen.spec
+++ b/packaging/pulseaudio-modules-tizen.spec
@@ -1,6 +1,6 @@
 Name:             pulseaudio-modules-tizen
 Summary:          Pulseaudio modules for Tizen
-Version:          13.0.62
+Version:          13.0.63
 Release:          0
 Group:            Multimedia/Audio
 License:          LGPL-2.1+

diff --git a/src/device-manager.c b/src/device-manager.c
index fbefe47..ef81274 100644 (file)
--- a/src/device-manager.c
+++ b/src/device-manager.c
@@ -55,7 +55,7 @@
 
 #define SHARED_DEVICE_MANAGER "tizen-device-manager"
 
-#define DEVICE_MAP_FILE                    "/etc/pulse/device-map.json"
+#define DEVICE_MAP_FILE                     PA_DEFAULT_CONFIG_DIR"/device-map.json"
 #define DEVICE_STR_MAX                      40
 #define DEVICE_DIRECTION_MAX                3
 #define DEVICE_PARAM_STRING_MAX             150

diff --git a/src/stream-manager.c b/src/stream-manager.c
index 8043287..fe45e37 100644 (file)
--- a/src/stream-manager.c
+++ b/src/stream-manager.c
@@ -104,7 +104,7 @@ static const char* notify_command_type_str[] = {
     [NOTIFY_COMMAND_INFORM_STREAM_DISCONNECTED] = "INFORM_STREAM_DISCONNECTED",
 };
 
-#define STREAM_MAP_FILE "/etc/pulse/stream-map.json"
+#define STREAM_MAP_FILE PA_DEFAULT_CONFIG_DIR"/stream-map.json"
 #define STREAM_MAP_VOLUMES "volumes"
 #define STREAM_MAP_VOLUME_TYPE "type"
 #define STREAM_MAP_VOLUME_IS_FOR_HAL "is-hal-volume"