cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=97f79344da31fa49a1869a8b07c1a1bb0cbde566
commit 97f79344da31fa49a1869a8b07c1a1bb0cbde566 Author: Ivan Furs <[email protected]> Date: Wed Dec 13 10:05:26 2017 -0800 ecore_audio: fix using undefined macros Summary: @T6154 Reviewers: vtorri, cedric, NikaWhite, raster Subscribers: artem.popov, vtorri, jenkins, cedric, jpeg Tags: #windows, #efl Differential Revision: https://phab.enlightenment.org/D5310 Signed-off-by: Cedric BAIL <[email protected]> --- src/Makefile_Ecore_Audio.am | 6 ++---- src/lib/ecore_audio/Ecore_Audio.h | 12 ++---------- src/lib/ecore_audio/ecore_audio_obj_out_wasapi.c | 4 ++++ 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/Makefile_Ecore_Audio.am b/src/Makefile_Ecore_Audio.am index c8a1caecc2..393fdfa799 100644 --- a/src/Makefile_Ecore_Audio.am +++ b/src/Makefile_Ecore_Audio.am @@ -38,7 +38,8 @@ lib/ecore_audio/ecore_audio_obj_in_tone.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 +lib/ecore_audio/ecore_audio_obj_out_sndfile.h \ +lib/ecore_audio/ecore_audio_obj_out_wasapi.h nodist_installed_ecoreaudiomainheaders_DATA = $(ecore_audio_eolian_h) @@ -62,9 +63,6 @@ lib/ecore_audio/ecore_audio_obj_out_pulse.c endif if HAVE_WIN32 -dist_installed_ecoreaudiomainheaders_DATA+= \ -lib/ecore_audio/ecore_audio_obj_out_wasapi.h - lib_ecore_audio_libecore_audio_la_SOURCES += \ lib/ecore_audio/ecore_audio_obj_out_wasapi.c endif diff --git a/src/lib/ecore_audio/Ecore_Audio.h b/src/lib/ecore_audio/Ecore_Audio.h index e508c9a6aa..e562205ca1 100644 --- a/src/lib/ecore_audio/Ecore_Audio.h +++ b/src/lib/ecore_audio/Ecore_Audio.h @@ -201,17 +201,9 @@ EAPI int ecore_audio_shutdown(void); #include <ecore_audio_obj_in_tone.h> -#if HAVE_PULSE -# include <ecore_audio_obj_out_pulse.h> -# define ECORE_AUDIO_OUT_RENDER_CLASS ECORE_AUDIO_OUT_PULSE_CLASS -# define ECORE_AUDIO_OUT_RENDER_EVENT_CONTEXT_FAIL ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL -#endif +#include <ecore_audio_obj_out_pulse.h> -#if HAVE_WASAPI -# include <ecore_audio_obj_out_wasapi.h> -# define ECORE_AUDIO_OUT_RENDER_CLASS ECORE_AUDIO_OUT_WASAPI_CLASS -# define ECORE_AUDIO_OUT_RENDER_EVENT_CONTEXT_FAIL ECORE_AUDIO_OUT_WASAPI_EVENT_CONTEXT_FAIL -#endif +#include <ecore_audio_obj_out_wasapi.h> /** * @} diff --git a/src/lib/ecore_audio/ecore_audio_obj_out_wasapi.c b/src/lib/ecore_audio/ecore_audio_obj_out_wasapi.c index 899a0f991c..772a8262f9 100644 --- a/src/lib/ecore_audio/ecore_audio_obj_out_wasapi.c +++ b/src/lib/ecore_audio/ecore_audio_obj_out_wasapi.c @@ -2,6 +2,8 @@ #include <config.h> #endif +#ifdef _WIN32 + #include <stdlib.h> #include <stdio.h> #include <string.h> @@ -607,3 +609,5 @@ _ecore_audio_out_wasapi_efl_object_destructor(Eo *eo_obj, Ecore_Audio_Out_Wasapi } #include "ecore_audio_out_wasapi.eo.c" + +#endif /*_WIN32*/ --
