summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Furs <i.furs@samsung.com>2017-12-13 10:06:35 -0800
committerCedric BAIL <cedric@osg.samsung.com>2017-12-13 10:27:48 -0800
commit55b8cf82441992910a908debe264497198250243 (patch)
tree1a5d2c99a22050d324516e974eb96a9a6ba5b9b2
parent97f79344da31fa49a1869a8b07c1a1bb0cbde566 (diff)
edje: fix using undefined macros(ECORE_AUDIO_OUT_RENDER_CLASS/ECORE_AUDIO_OUT_RENDER_EVENT_CONTEXT_FAIL)
Summary: @T6154 Reviewers: vtorri, NikaWhite, raster, cedric Subscribers: artem.popov, jenkins, cedric, jpeg Tags: #windows, #efl Differential Revision: https://phab.enlightenment.org/D5311 Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
-rw-r--r--src/lib/edje/edje_multisense.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/lib/edje/edje_multisense.c b/src/lib/edje/edje_multisense.c
index f8f5ae8317..e8c0081d2f 100644
--- a/src/lib/edje/edje_multisense.c
+++ b/src/lib/edje/edje_multisense.c
@@ -202,16 +202,25 @@ _edje_multisense_internal_sound_sample_play(Edje *ed, const char *sample_name, c
202 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)); 202 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));
203 if (!out) 203 if (!out)
204 { 204 {
205
206#ifdef _WIN32
207 out = efl_add(ECORE_AUDIO_OUT_WASAPI_CLASS, NULL, efl_event_callback_add(efl_added, ECORE_AUDIO_OUT_WASAPI_EVENT_CONTEXT_FAIL, _out_fail, NULL));
208#else
205#if HAVE_PULSE 209#if HAVE_PULSE
206 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)); 210 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));
207#endif 211#endif
212#endif
208 if (out) outs++; 213 if (out) outs++;
209 } 214 }
210 if (!out) 215 if (!out)
211 { 216 {
217#ifdef _WIN32
218 ERR("Could not create multisense audio out (wasapi)");
219#else
212#if HAVE_PULSE 220#if HAVE_PULSE
213 ERR("Could not create multisense audio out (pulse)"); 221 ERR("Could not create multisense audio out (pulse)");
214#endif 222#endif
223#endif
215 efl_del(in); 224 efl_del(in);
216 return EINA_FALSE; 225 return EINA_FALSE;
217 } 226 }
@@ -270,9 +279,13 @@ _edje_multisense_internal_sound_tone_play(Edje *ed, const char *tone_name, const
270 279
271 if (!out) 280 if (!out)
272 { 281 {
282#ifdef _WIN32
283 out = efl_add(ECORE_AUDIO_OUT_WASAPI_CLASS, NULL, efl_event_callback_add(efl_added, ECORE_AUDIO_OUT_WASAPI_EVENT_CONTEXT_FAIL, _out_fail, NULL));
284#else
273#if HAVE_PULSE 285#if HAVE_PULSE
274 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)); 286 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));
275#endif 287#endif
288#endif
276 if (out) outs++; 289 if (out) outs++;
277 } 290 }
278 291