diff options
| author | Seungbae Shin <seungbae.shin@samsung.com> | 2016-03-16 16:19:08 +0900 |
|---|---|---|
| committer | Seungbae Shin <seungbae.shin@samsung.com> | 2016-03-16 17:29:57 +0900 |
| commit | e79006973e831643a884a6ca69c29a143207d554 (patch) | |
| tree | efd86c94cd9b69fa20ffa2b5d766da40b67fd365 | |
| parent | 4cebae06c28837dda0d1f8b434e6ded3f5d03c99 (diff) | |
| download | audio-hal-wm1831-e79006973e831643a884a6ca69c29a143207d554.tar.gz audio-hal-wm1831-e79006973e831643a884a6ca69c29a143207d554.tar.bz2 audio-hal-wm1831-e79006973e831643a884a6ca69c29a143207d554.zip | |
Update ini file path & avoid build warningsubmit/tizen/20160321.072619
/usr/etc => /etc/multimedia/ (/etc/ is from _sysconfdir in spec)
[Version] 0.1.1
[Profile] Common
[Issue Type] Etc.
Change-Id: I53c27153b8ed36e676c0cc7776c830e51617b323
| -rw-r--r-- | packaging/audio-hal-wm1831.spec | 4 | ||||
| -rw-r--r-- | tizen-audio-device.c | 5 | ||||
| -rw-r--r-- | tizen-audio-volume.c | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/packaging/audio-hal-wm1831.spec b/packaging/audio-hal-wm1831.spec index 7e36e0b..7ff7681 100644 --- a/packaging/audio-hal-wm1831.spec +++ b/packaging/audio-hal-wm1831.spec @@ -1,6 +1,6 @@ Name: audio-hal-wm1831 Summary: TIZEN Audio HAL for WM1831 -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 WM1831 %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 b39790a..2a22f81 100644 --- 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 c8f9a42..a81c160 100644 --- 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) |