summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--configure.ac16
-rw-r--r--src/Makefile_Ecore_Audio.am8
-rw-r--r--src/lib/ecore_audio/Ecore_Audio.h2
-rw-r--r--src/lib/ecore_audio/ecore_audio_private.h8
4 files changed, 10 insertions, 24 deletions
diff --git a/configure.ac b/configure.ac
index 1418f634d9..5e0b3fe0c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2461,19 +2461,8 @@ EFL_LIB_START_OPTIONAL([Ecore_Audio], [test "${want_audio}" = "yes"])
2461 2461
2462### Additional options to configure 2462### Additional options to configure
2463 2463
2464# ALSA support is not well tested, disable by default 2464# ALSA support is still not there, thus no option for it yet.
2465AC_ARG_ENABLE([alsa], 2465want_alsa="no"
2466 [AC_HELP_STRING([--enable-alsa],
2467 [enable alsa sound support. @<:@default=enabled@:>@])],
2468 [
2469 if test "x${enableval}" = "xyes" ; then
2470 want_alsa="yes"
2471 else
2472 want_alsa="no"
2473 fi
2474 ],
2475 [want_alsa="no"])
2476
2477 2466
2478# sndfile is mandatory otherwise it won't read from/write to files. 2467# sndfile is mandatory otherwise it won't read from/write to files.
2479# TODO: if confirmed sndfile is mandatory, remove this variable 2468# TODO: if confirmed sndfile is mandatory, remove this variable
@@ -2531,7 +2520,6 @@ EFL_ADD_FEATURE([ECORE_AUDIO], [sndfile])
2531### Checks for library functions 2520### Checks for library functions
2532 2521
2533EFL_LIB_END_OPTIONAL([Ecore_Audio]) 2522EFL_LIB_END_OPTIONAL([Ecore_Audio])
2534AM_CONDITIONAL([HAVE_ECORE_AUDIO_ALSA], [test "x${want_alsa}" = "xyes"])
2535AM_CONDITIONAL([HAVE_ECORE_AUDIO_PULSE], [test "x${want_pulseaudio}" = "xyes"]) 2523AM_CONDITIONAL([HAVE_ECORE_AUDIO_PULSE], [test "x${want_pulseaudio}" = "xyes"])
2536AM_CONDITIONAL([HAVE_ECORE_AUDIO_SNDFILE], [test "x${want_sndfile}" = "xyes"]) 2524AM_CONDITIONAL([HAVE_ECORE_AUDIO_SNDFILE], [test "x${want_sndfile}" = "xyes"])
2537 2525
diff --git a/src/Makefile_Ecore_Audio.am b/src/Makefile_Ecore_Audio.am
index 62f2485410..35a414cc52 100644
--- a/src/Makefile_Ecore_Audio.am
+++ b/src/Makefile_Ecore_Audio.am
@@ -27,14 +27,6 @@ lib_ecore_audio_libecore_audio_la_LIBADD = @ECORE_AUDIO_LIBS@
27lib_ecore_audio_libecore_audio_la_DEPENDENCIES = @ECORE_AUDIO_INTERNAL_LIBS@ 27lib_ecore_audio_libecore_audio_la_DEPENDENCIES = @ECORE_AUDIO_INTERNAL_LIBS@
28lib_ecore_audio_libecore_audio_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 28lib_ecore_audio_libecore_audio_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
29 29
30if HAVE_ECORE_AUDIO_ALSA
31dist_installed_ecoreaudiomainheaders_DATA += \
32lib/ecore_audio/ecore_audio_obj_out_alsa.h
33
34lib_ecore_audio_libecore_audio_la_SOURCES += \
35lib/ecore_audio/ecore_audio_obj_out_alsa.c
36endif
37
38if HAVE_ECORE_AUDIO_PULSE 30if HAVE_ECORE_AUDIO_PULSE
39dist_installed_ecoreaudiomainheaders_DATA += \ 31dist_installed_ecoreaudiomainheaders_DATA += \
40lib/ecore_audio/ecore_audio_obj_out_pulse.h 32lib/ecore_audio/ecore_audio_obj_out_pulse.h
diff --git a/src/lib/ecore_audio/Ecore_Audio.h b/src/lib/ecore_audio/Ecore_Audio.h
index 5e676348f0..e97706032f 100644
--- a/src/lib/ecore_audio/Ecore_Audio.h
+++ b/src/lib/ecore_audio/Ecore_Audio.h
@@ -212,8 +212,6 @@ EAPI int ecore_audio_shutdown(void);
212 212
213#include <ecore_audio_obj_out_pulse.h> 213#include <ecore_audio_obj_out_pulse.h>
214 214
215#include <ecore_audio_obj_out_alsa.h>
216
217/** 215/**
218 * @} 216 * @}
219 */ 217 */
diff --git a/src/lib/ecore_audio/ecore_audio_private.h b/src/lib/ecore_audio/ecore_audio_private.h
index a28ca7c374..35afa85f4c 100644
--- a/src/lib/ecore_audio/ecore_audio_private.h
+++ b/src/lib/ecore_audio/ecore_audio_private.h
@@ -146,6 +146,14 @@ extern Eina_List *ecore_audio_modules;
146 146
147#ifdef HAVE_ALSA 147#ifdef HAVE_ALSA
148/* ecore_audio_alsa */ 148/* ecore_audio_alsa */
149struct _Ecore_Audio_Alsa
150{
151 ECORE_MAGIC;
152 snd_pcm_t *handle;
153 unsigned int channels;
154 unsigned int samplerate;
155};
156
149Ecore_Audio_Module *ecore_audio_alsa_init(void); 157Ecore_Audio_Module *ecore_audio_alsa_init(void);
150void ecore_audio_alsa_shutdown(void); 158void ecore_audio_alsa_shutdown(void);
151#endif /* HAVE_ALSA */ 159#endif /* HAVE_ALSA */