aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/edje/edje_multisense.c
diff options
context:
space:
mode:
authorIvan Furs <i.furs@samsung.com>2017-10-03 11:22:07 -0700
committerCedric BAIL <cedric@osg.samsung.com>2017-10-03 11:36:49 -0700
commitc1c424a4075a85375c83f4c137b74c9919c5fc57 (patch)
treed5a6a39cec01302e708e6e64aacfb47d62cba0c3 /src/lib/edje/edje_multisense.c
parentecore_audio: a minimal template for playing sound on WINDOWS is added (diff)
downloadefl-c1c424a4075a85375c83f4c137b74c9919c5fc57.tar.gz
edje: moved from edje_multisense.c to Ecore_Audio.h for select the type of render.
Reviewers: NikaWhite, raster, cedric, vtorri, rimmed Reviewed By: NikaWhite, vtorri Subscribers: artem.popov, cedric, jpeg Differential Revision: https://phab.enlightenment.org/D5096 Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
Diffstat (limited to '')
-rw-r--r--src/lib/edje/edje_multisense.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/lib/edje/edje_multisense.c b/src/lib/edje/edje_multisense.c
index f8f5ae8317..82c553427f 100644
--- a/src/lib/edje/edje_multisense.c
+++ b/src/lib/edje/edje_multisense.c
@@ -202,16 +202,12 @@ _edje_multisense_internal_sound_sample_play(Edje *ed, const char *sample_name, c
in = efl_add(ECORE_AUDIO_IN_SNDFILE_CLASS, NULL, ecore_audio_obj_name_set(efl_added, snd_id_str), ecore_audio_obj_in_speed_set(efl_added, speed), ecore_audio_obj_vio_set(efl_added, &eet_data->vio, eet_data, _free), efl_event_callback_add(efl_added, ECORE_AUDIO_IN_EVENT_IN_STOPPED, _play_finished, NULL));
if (!out)
{
-#if HAVE_PULSE
- out = efl_add(ECORE_AUDIO_OUT_PULSE_CLASS, NULL, efl_event_callback_add(efl_added, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, _out_fail, NULL));
-#endif
+ out = efl_add(ECORE_AUDIO_OUT_RENDER_CLASS, NULL, efl_event_callback_add(efl_added, ECORE_AUDIO_OUT_RENDER_EVENT_CONTEXT_FAIL, _out_fail, NULL));
if (out) outs++;
}
if (!out)
{
-#if HAVE_PULSE
- ERR("Could not create multisense audio out (pulse)");
-#endif
+ ERR("Could not create multisense audio out");
efl_del(in);
return EINA_FALSE;
}
@@ -270,9 +266,7 @@ _edje_multisense_internal_sound_tone_play(Edje *ed, const char *tone_name, const
if (!out)
{
-#if HAVE_PULSE
- out = efl_add(ECORE_AUDIO_OUT_PULSE_CLASS, NULL, efl_event_callback_add(efl_added, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, _out_fail, NULL));
-#endif
+ out = efl_add(ECORE_AUDIO_OUT_RENDER_CLASS, NULL, efl_event_callback_add(efl_added, ECORE_AUDIO_OUT_RENDER_EVENT_CONTEXT_FAIL, _out_fail, NULL));
if (out) outs++;
}