[EGIT] [core/efl] master 05/05: edje: fix using undefined macros(ECORE_AUDIO_OUT_RENDER_CLASS/ECORE_AUDIO_OUT_RENDER_EVENT_CONTEXT_FAIL)

[Ivan Furs]

cedric pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=55b8cf82441992910a908debe264497198250243

commit 55b8cf82441992910a908debe264497198250243
Author: Ivan Furs <i.f...@samsung.com>
Date:   Wed Dec 13 10:06:35 2017 -0800

    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 <ced...@osg.samsung.com>
---
 src/lib/edje/edje_multisense.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

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
              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)
                {
+
+#ifdef _WIN32
+                  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));
+#else
 #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
+#endif
                   if (out) outs++;
                }
              if (!out)
                {
+#ifdef _WIN32
+                  ERR("Could not create multisense audio out (wasapi)");
+#else
 #if HAVE_PULSE
                   ERR("Could not create multisense audio out (pulse)");
 #endif
+#endif
                   efl_del(in);
                   return EINA_FALSE;
                }
@@ -270,9 +279,13 @@ _edje_multisense_internal_sound_tone_play(Edje *ed, const 
char *tone_name, const
 
              if (!out)
                {
+#ifdef _WIN32
+                  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));
+#else
 #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
+#endif
                   if (out) outs++;
                }
 

--