dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <cedric@osg.samsung.com>
This commit is contained in:
Ivan Furs 2017-12-13 10:05:26 -08:00 committed by Cedric BAIL
parent 53c548a97e
commit 97f79344da
3 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Makefile_Ecore_Audio.am
View File

@ -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

12
src/lib/ecore_audio/Ecore_Audio.h
View File

@ -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>
/**
* @}

4
src/lib/ecore_audio/ecore_audio_obj_out_wasapi.c
View File

@ -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*/