Replace freealut with ALURE

This is to support .ogg file format.

[Version] 0.0.7
[Issue Tpe] Adding Feature

Change-Id: I9103ee684aa6aa3af36062acaf02f5039d03a709
Signed-off-by: aravind.gara <aravind.gara@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c321ffd22cf251ec32d6eec1c7ab8811b24981e8..0555429f00dc144247f29d75a691162989bb01a4 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,12 +9,14 @@ SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(INC_DIR include)
 INCLUDE_DIRECTORIES(${INC_DIR})
 
-SET(dependents "dlog glib-2.0 openal freealut" )
+SET(dependents "dlog glib-2.0 openal")
 
 IF(DEFINED ENV{ENABLE_ALURE})
-    SET(dependents "${dependents} alure" )
+    SET(dependents "${dependents} alure")
     SET(PKG_CONFIG_CFLAGS "${PKG_CONFIG_CFLAGS} -DENABLE_ALURE")
     SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -DENABLE_ALURE")
+ELSE()
+    SET(dependents "${dependents} freealut")
 ENDIF()
 
 INCLUDE(FindPkgConfig)

diff --git a/include/sound_pool_private.h b/include/sound_pool_private.h
index a170d6c27f29afbb6d6dcc0987b591de1ef52119..ef6e620888b47d1b5e1b104a0543215918ac32b3 100644 (file)
--- a/include/sound_pool_private.h
+++ b/include/sound_pool_private.h
@@ -54,13 +54,6 @@ extern "C" {
 #define FONT_COLOR_GRAY
 #endif
 
-/**
- * @brief Max amount of sound pools which could be created.
- *
- * @since_tizen 3.0
- */
-#define SOUND_POOL_MAX_POOLS_AMOUNT 32U
-
 #define SP_DEBUG(fmt, arg...)                             \
        do {                                                  \
                LOGD(FONT_COLOR_RESET""fmt"", ##arg);             \

diff --git a/packaging/capi-media-sound-pool.spec b/packaging/capi-media-sound-pool.spec
index 8b97ab999b9389fb341896279303a61b2e16fb87..759644d9968f3d025edd0252f071bdadbfa34152 100644 (file)
--- a/packaging/capi-media-sound-pool.spec
+++ b/packaging/capi-media-sound-pool.spec
@@ -1,5 +1,5 @@
 Name:       capi-media-sound-pool
-Version:    0.0.6
+Version:    0.0.7
 Summary:    Tizen Sound Pool module
 Release:    0
 Group:      Multimedia/Framework
@@ -11,8 +11,8 @@ BuildRequires: cmake
 BuildRequires: pkgconfig(dlog)
 BuildRequires: pkgconfig(glib-2.0)
 BuildRequires: pkgconfig(openal)
-BuildRequires: pkgconfig(freealut)
-#BuildRequires: pkgconfig(alure)
+#BuildRequires: pkgconfig(freealut)
+BuildRequires: pkgconfig(alure)
 
 %description
 Tizen Sound Pool Module allowing sounds playing for audio resources.
@@ -33,7 +33,7 @@ cp %{SOURCE1001} .
 export CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"
 export CXXFLAGS="$CXXFLAGS -fprofile-arcs -ftest-coverage"
 export LDFLAGS="$LDFLAGS -lgcov"
-#export ENABLE_ALURE=1
+export ENABLE_ALURE=1
 
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 %cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER}

diff --git a/src/source.c b/src/source.c
index 733cd2d139ec3f540b2334e5b769795c2e9a07f0..b5c74d9daf7179a4f4ef34c580eb13fa8d27e556 100644 (file)
--- a/src/source.c
+++ b/src/source.c
@@ -24,9 +24,10 @@
 #include "internal/stream.h"
 
 #include <unistd.h>
-#include <AL/alut.h>
 #ifdef ENABLE_ALURE
-#      include <AL/alure.h>
+#include <AL/alure.h>
+#else
+#include <AL/alut.h>
 #endif
 
 static sound_pool_error_e __sound_pool_add_source(sound_pool_t *pool, sound_source_t *src);