summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRafael Antognolli <rafael.antognolli@intel.com>2013-05-03 17:44:07 -0300
committerRafael Antognolli <rafael.antognolli@intel.com>2013-05-03 17:44:07 -0300
commitb9836fbc07794ea75c86dcd8bb27aad6d96c667d (patch)
treefec9876a355a648ae2788c863083af0b9129fa82 /src
parent70e882cefb2b9383d2d7d15df1bb05b6d770393c (diff)
Revert "ecore_audio: Add alsa support"
This reverts commit 4db03f700cfaa8261db11a3a0c7162f0e7b71f0d.
Diffstat (limited to '')
-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
3 files changed, 8 insertions, 10 deletions
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 */