Update ini file path & avoid build warning

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

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

Change-Id: I53c27153b8ed36e676c0cc7776c830e51617b323

diff --git a/packaging/audio-hal-emul.spec b/packaging/audio-hal-emul.spec
index d073fdae8ecc9ca3915c90dc5b620ab98ce89da6..86f569a849afffbdf6b19f732174afa5d0e1a297 100644 (file)
--- a/packaging/audio-hal-emul.spec
+++ b/packaging/audio-hal-emul.spec
@@ -1,6 +1,6 @@
 Name:       audio-hal-emul
 Summary:    TIZEN Audio HAL for Emulator
-Version:    0.1.0
+Version:    0.1.1
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0
@@ -20,7 +20,7 @@ TIZEN Audio HAL for Emulator
 %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 fff017d2e3215d7bbc1c59e6fafd042689d13f59..d4bdc1bed296fa338f69a4e5713219951f9d308d 100644 (file)
--- a/tizen-audio-device.c
+++ b/tizen-audio-device.c
@@ -28,6 +28,11 @@
 
 #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 f3e3d66d0d3df96a13a0e12c72bdf0cc8af02434..43ecd819e55cfa9ccff013a7fc20cd18df0b408c 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)