forked from enlightenment/efl
ecore_audio: Remove includes of optional modules from public .h file
For now programs using pulse output need to include the respective .h file themselves. Make sure test, examples, multisense and pulse actually include the needed headers Signed-off-by: Daniel Willmann <d.willmann@samsung.com>
This commit is contained in:
parent
509090bafc
commit
5d0daf9f3b
|
@ -9,6 +9,7 @@
|
|||
#include <fcntl.h>
|
||||
#include <Ecore.h>
|
||||
#include <Ecore_Audio.h>
|
||||
#include <ecore_audio_obj_out_pulse.h>
|
||||
#include <math.h>
|
||||
|
||||
Eo *in = NULL;
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
#include <fcntl.h>
|
||||
#include <Ecore.h>
|
||||
#include <Ecore_Audio.h>
|
||||
#include <ecore_audio_obj_out_pulse.h>
|
||||
#include <Eina.h>
|
||||
|
||||
Eo *out = NULL;
|
||||
|
|
|
@ -210,8 +210,6 @@ EAPI int ecore_audio_shutdown(void);
|
|||
|
||||
#include <ecore_audio_obj_in_tone.h>
|
||||
|
||||
#include <ecore_audio_obj_out_pulse.h>
|
||||
|
||||
/**
|
||||
* @}
|
||||
*/
|
||||
|
|
|
@ -12,6 +12,7 @@
|
|||
|
||||
#include <Eo.h>
|
||||
#include "ecore_audio_private.h"
|
||||
#include "ecore_audio_obj_out_pulse.h"
|
||||
#include <pulse/pulseaudio.h>
|
||||
|
||||
#include <sys/time.h>
|
||||
|
|
|
@ -1,6 +1,18 @@
|
|||
#include "edje_private.h"
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#ifdef ENABLE_MULTISENSE
|
||||
|
||||
#ifdef HAVE_PULSE
|
||||
#include "ecore_audio_obj_out_pulse.h"
|
||||
#define MY_CLASS ECORE_AUDIO_OBJ_OUT_PULSE_CLASS
|
||||
#else
|
||||
#error "Multisense needs Pulseaudio suport!"
|
||||
#endif
|
||||
|
||||
#include <sndfile.h>
|
||||
#include "Ecore_Audio.h"
|
||||
|
||||
|
@ -153,7 +165,7 @@ _edje_multisense_internal_sound_sample_play(Edje *ed, const char *sample_name, c
|
|||
eo_event_callback_add(ECORE_AUDIO_EV_IN_STOPPED, _play_finished, NULL));
|
||||
if (!out)
|
||||
{
|
||||
out = eo_add(ECORE_AUDIO_OBJ_OUT_PULSE_CLASS, NULL);
|
||||
out = eo_add(MY_CLASS, NULL);
|
||||
if (out) outs++;
|
||||
}
|
||||
if (!out)
|
||||
|
@ -210,7 +222,7 @@ _edje_multisense_internal_sound_tone_play(Edje *ed, const char *tone_name, const
|
|||
eo_do(in, eo_event_callback_add(ECORE_AUDIO_EV_IN_STOPPED, _play_finished, NULL));
|
||||
|
||||
if (!out)
|
||||
out = eo_add(ECORE_AUDIO_OBJ_OUT_PULSE_CLASS, NULL);
|
||||
out = eo_add(MY_CLASS, NULL);
|
||||
|
||||
eo_do(out, ecore_audio_obj_out_input_attach(in, &ret));
|
||||
if (!ret) {
|
||||
|
|
|
@ -13,6 +13,12 @@
|
|||
#include <Ecore.h>
|
||||
#include <Ecore_Audio.h>
|
||||
|
||||
#ifdef HAVE_PULSE
|
||||
#include <ecore_audio_obj_out_pulse.h>
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
#if 0
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue