From: Jiwon Kim Date: Thu, 6 Apr 2017 21:41:44 +0000 (-0700) Subject: edje: remove invalid macro-check regarding coreaudio X-Git-Tag: upstream/1.20.0~1604 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1bd7b576bd126e0f64aecfc8b051dd0efb1ef096;p=platform%2Fupstream%2Fefl.git edje: remove invalid macro-check regarding coreaudio Summary: By 403b0ecfa66530e9cd598bd013aeda76df7ee98c the coreaudio support was dropped. So 'HAVE_COREAUDIO' define is invalid. Reviewers: jpeg Subscribers: cedric, woohyun Differential Revision: https://phab.enlightenment.org/D4732 Signed-off-by: Cedric BAIL --- diff --git a/src/lib/edje/edje_multisense.c b/src/lib/edje/edje_multisense.c index 06f030f..f8f5ae8 100644 --- a/src/lib/edje/edje_multisense.c +++ b/src/lib/edje/edje_multisense.c @@ -202,18 +202,14 @@ _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_COREAUDIO - out = efl_add(ECORE_AUDIO_OUT_CORE_AUDIO_CLASS, NULL); -#elif HAVE_PULSE +#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 if (out) outs++; } if (!out) { -#if HAVE_COREAUDIO - ERR("Could not create multisense audio out (CoreAudio)"); -#elif HAVE_PULSE +#if HAVE_PULSE ERR("Could not create multisense audio out (pulse)"); #endif efl_del(in); @@ -274,9 +270,7 @@ _edje_multisense_internal_sound_tone_play(Edje *ed, const char *tone_name, const if (!out) { -#if HAVE_COREAUDIO - out = efl_add(ECORE_AUDIO_OUT_CORE_AUDIO_CLASS, NULL); -#elif HAVE_PULSE +#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 if (out) outs++;