Revert "ecore_audio: Add alsa support"

This reverts commit 4db03f700c.
This commit is contained in:
Rafael Antognolli 2013-05-03 17:44:07 -03:00
parent 70e882cefb
commit b9836fbc07
4 changed files with 10 additions and 24 deletions

View File

@ -2461,19 +2461,8 @@ EFL_LIB_START_OPTIONAL([Ecore_Audio], [test "${want_audio}" = "yes"])
### Additional options to configure
# ALSA support is not well tested, disable by default
AC_ARG_ENABLE([alsa],
[AC_HELP_STRING([--enable-alsa],
[enable alsa sound support. @<:@default=enabled@:>@])],
[
if test "x${enableval}" = "xyes" ; then
want_alsa="yes"
else
want_alsa="no"
fi
],
[want_alsa="no"])
# ALSA support is still not there, thus no option for it yet.
want_alsa="no"
# sndfile is mandatory otherwise it won't read from/write to files.
# TODO: if confirmed sndfile is mandatory, remove this variable
@ -2531,7 +2520,6 @@ EFL_ADD_FEATURE([ECORE_AUDIO], [sndfile])
### Checks for library functions
EFL_LIB_END_OPTIONAL([Ecore_Audio])
AM_CONDITIONAL([HAVE_ECORE_AUDIO_ALSA], [test "x${want_alsa}" = "xyes"])
AM_CONDITIONAL([HAVE_ECORE_AUDIO_PULSE], [test "x${want_pulseaudio}" = "xyes"])
AM_CONDITIONAL([HAVE_ECORE_AUDIO_SNDFILE], [test "x${want_sndfile}" = "xyes"])

View File

@ -27,14 +27,6 @@ lib_ecore_audio_libecore_audio_la_LIBADD = @ECORE_AUDIO_LIBS@
lib_ecore_audio_libecore_audio_la_DEPENDENCIES = @ECORE_AUDIO_INTERNAL_LIBS@
lib_ecore_audio_libecore_audio_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
if HAVE_ECORE_AUDIO_ALSA
dist_installed_ecoreaudiomainheaders_DATA += \
lib/ecore_audio/ecore_audio_obj_out_alsa.h
lib_ecore_audio_libecore_audio_la_SOURCES += \
lib/ecore_audio/ecore_audio_obj_out_alsa.c
endif
if HAVE_ECORE_AUDIO_PULSE
dist_installed_ecoreaudiomainheaders_DATA += \
lib/ecore_audio/ecore_audio_obj_out_pulse.h

View File

@ -212,8 +212,6 @@ EAPI int ecore_audio_shutdown(void);
#include <ecore_audio_obj_out_pulse.h>
#include <ecore_audio_obj_out_alsa.h>
/**
* @}
*/

View File

@ -146,6 +146,14 @@ extern Eina_List *ecore_audio_modules;
#ifdef HAVE_ALSA
/* ecore_audio_alsa */
struct _Ecore_Audio_Alsa
{
ECORE_MAGIC;
snd_pcm_t *handle;
unsigned int channels;
unsigned int samplerate;
};
Ecore_Audio_Module *ecore_audio_alsa_init(void);
void ecore_audio_alsa_shutdown(void);
#endif /* HAVE_ALSA */