diff options
| author | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2017-07-22 17:59:11 +0900 |
|---|---|---|
| committer | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2017-07-22 17:59:11 +0900 |
| commit | 8f67f2f2d3e18219e7a88ce4ab008fc40122b59d (patch) | |
| tree | 1366db8e870baa95426c2a283d7e476c802b46da | |
| parent | a311de5fe595690b51ad5486e3ae03ec7719d066 (diff) | |
| download | efl-8f67f2f2d3e18219e7a88ce4ab008fc40122b59d.tar.gz | |
ecore_audio headers conflict with app have ifdefs
Ecore_Audio.h had #ifdef HAVE_PULSE ... and that is just so wrong as
this is something an ap[p may or may not set in its config.h ... but
this certainly hase no place in our public headers. the api's there
should always be there... symbols always... just imtplementation may
be empty ... though ecore_audio doesnt build at all without pulse...
so it's moot.
so fix this build issue i found when fixing e build issues with meson
changes etc.
@fix
| -rw-r--r-- | src/Makefile_Ecore_Audio.am | 12 | ||||
| -rw-r--r-- | src/lib/ecore_audio/Ecore_Audio.h | 4 |
2 files changed, 5 insertions, 11 deletions
diff --git a/src/Makefile_Ecore_Audio.am b/src/Makefile_Ecore_Audio.am index f57595f7f4..bd68dd6c4b 100644 --- a/src/Makefile_Ecore_Audio.am +++ b/src/Makefile_Ecore_Audio.am @@ -34,7 +34,10 @@ lib/ecore_audio/ecore_audio_obj.h \ lib/ecore_audio/ecore_audio_obj_in.h \ lib/ecore_audio/ecore_audio_obj_out.h \ lib/ecore_audio/ecore_audio_obj_in_tone.h \ -lib/ecore_audio/ecore_audio_protected.h +lib/ecore_audio/ecore_audio_protected.h \ +lib/ecore_audio/ecore_audio_obj_out_pulse.h \ +lib/ecore_audio/ecore_audio_obj_in_sndfile.h \ +lib/ecore_audio/ecore_audio_obj_out_sndfile.h nodist_installed_ecoreaudiomainheaders_DATA = $(ecore_audio_eolian_h) @@ -52,19 +55,12 @@ 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_PULSE -dist_installed_ecoreaudiomainheaders_DATA += \ -lib/ecore_audio/ecore_audio_obj_out_pulse.h - lib_ecore_audio_libecore_audio_la_SOURCES += \ lib/ecore_audio/ecore_audio_pulse_ml.c \ lib/ecore_audio/ecore_audio_obj_out_pulse.c endif if HAVE_ECORE_AUDIO_SNDFILE -dist_installed_ecoreaudiomainheaders_DATA += \ -lib/ecore_audio/ecore_audio_obj_in_sndfile.h \ -lib/ecore_audio/ecore_audio_obj_out_sndfile.h - lib_ecore_audio_libecore_audio_la_SOURCES += \ lib/ecore_audio/ecore_audio_obj_in_sndfile.c \ lib/ecore_audio/ecore_audio_obj_out_sndfile.c \ diff --git a/src/lib/ecore_audio/Ecore_Audio.h b/src/lib/ecore_audio/Ecore_Audio.h index af58822c59..0cc7bec29c 100644 --- a/src/lib/ecore_audio/Ecore_Audio.h +++ b/src/lib/ecore_audio/Ecore_Audio.h @@ -193,9 +193,7 @@ EAPI int ecore_audio_shutdown(void); #include <ecore_audio_obj_in_tone.h> -#if HAVE_PULSE -# include <ecore_audio_obj_out_pulse.h> -#endif +#include <ecore_audio_obj_out_pulse.h> /** * @} |