Update ini file path & avoid build warning

/usr/etc => /etc/multimedia/ (/etc/ is from _sysconfdir in spec)

[Version] 0.2.17
[Profile] Common
[Issue Type] Etc.

Change-Id: I53c27153b8ed36e676c0cc7776c830e51617b323

diff --git a/packaging/audio-hal-max98090.spec b/packaging/audio-hal-max98090.spec
index 860c801..d3f2f7f 100644 (file)
--- a/packaging/audio-hal-max98090.spec
+++ b/packaging/audio-hal-max98090.spec
@@ -1,6 +1,6 @@
 Name:       audio-hal-max98090
 Summary:    TIZEN Audio HAL for MAX98090
-Version:    0.2.16
+Version:    0.2.17
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0
@@ -20,7 +20,7 @@ TIZEN Audio HAL for MAX98090
 %setup -q -n %{name}-%{version}
 
 %build
-export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE"
+export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE -DSYSCONFDIR=\\\"%{_sysconfdir}\\\""
 export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE"
 export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
 

diff --git a/tizen-audio-device.c b/tizen-audio-device.c
index afc0af6..e9c4d11 100644 (file)
--- a/tizen-audio-device.c
+++ b/tizen-audio-device.c
@@ -28,6 +28,10 @@
 
 #include "tizen-audio-internal.h"
 
+#ifndef __USE_TINYALSA__
+/* FIXME : To avoid build warning... */
+int _snd_pcm_poll_descriptor(snd_pcm_t *pcm);
+#endif
 /* #define DEBUG_TIMING */
 
 static device_type_t outDeviceTypes[] = {

diff --git a/tizen-audio-volume.c b/tizen-audio-volume.c
index c8f9a42..a81c160 100644 (file)
--- a/tizen-audio-volume.c
+++ b/tizen-audio-volume.c
@@ -30,7 +30,7 @@
 
 #include "tizen-audio-internal.h"
 
-#define VOLUME_INI_DEFAULT_PATH     "/usr/etc/mmfw_audio_volume.ini"
+#define VOLUME_INI_DEFAULT_PATH     SYSCONFDIR"/multimedia/mmfw_audio_volume.ini" /* SYSCONFDIR is defined at .spec */
 #define VOLUME_INI_TEMP_PATH        "/opt/system/mmfw_audio_volume.ini"
 #define VOLUME_VALUE_MAX            (1.0f)
 #define GAIN_VALUE_MAX              (1.0f)