cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=76d02d1e700059ad7d57b2621effc312b4e0c99e
commit 76d02d1e700059ad7d57b2621effc312b4e0c99e Author: Igor Gala <[email protected]> Date: Fri Jun 13 17:59:36 2014 +0200 edje: Edje_Edit - some minor edits Summary: rename function edje_edit_sound_xxxxx_get in h-file for matching like in c-file. This function has not called anywhere. So it should be no problem. @fix Reviewers: seoz, raster, Hermet, cedric Reviewed By: cedric CC: reutskiy.v.v, cedric Differential Revision: https://phab.enlightenment.org/D1029 Signed-off-by: Cedric BAIL <[email protected]> --- src/lib/edje/Edje_Edit.h | 10 +++---- src/lib/edje/edje_edit.c | 77 +++++++++++++++++++++++------------------------- 2 files changed, 42 insertions(+), 45 deletions(-) diff --git a/src/lib/edje/Edje_Edit.h b/src/lib/edje/Edje_Edit.h index 7eeb8b6..fb941eb 100644 --- a/src/lib/edje/Edje_Edit.h +++ b/src/lib/edje/Edje_Edit.h @@ -782,7 +782,7 @@ EAPI Eina_Bool edje_edit_external_del(Evas_Object *obj, const char *external); * * @return List of strings, each being the name for a part in the open group. * The return value should be freed with edje_edit_string_list_free(). - * + * * @see edje_edit_string_list_free() */ EAPI Eina_List * edje_edit_parts_list_get(Evas_Object *obj); @@ -3614,7 +3614,7 @@ EAPI Eina_Bool edje_edit_state_tween_del(Evas_Object *obj, const char *part, con * * @return A List containing all sounds samples names found in the edje file. */ -EAPI Eina_List * edje_edit_sounds_samples_get(Evas_Object *obj); +EAPI Eina_List * edje_edit_sounds_samples_list_get(Evas_Object *obj); /** Get the list of all the sounds tones in the given edje. * Use edje_edit_string_list_free() when you don't need the list anymore. @@ -3623,7 +3623,7 @@ EAPI Eina_List * edje_edit_sounds_samples_get(Evas_Object *obj); * * @return A List containing all sounds tones names found in the edje file. */ -EAPI Eina_List * edje_edit_sounds_tones_get(Evas_Object *obj); +EAPI Eina_List * edje_edit_sounds_tones_list_get(Evas_Object *obj); /** Add new sound sample to samples collection * @@ -3674,7 +3674,7 @@ EAPI Eina_Bool edje_edit_sound_tone_del(Evas_Object *obj, const char* name); /** Get the sound quality compression. * *@param obj Object being edited. - *@param name The name of the sample. + *@param sound The name of the sample. * *@return Quality of the compression of the sample sound. */ @@ -3683,7 +3683,7 @@ EAPI double edje_edit_sound_compression_rate_get(Evas_Object *obj, const char* s /* Set the sound quality compression. * *@param obj Object being edited. - *@param name The name of the sample. + *@param sound The name of the sample. *@param rate Quality of the compression. * *@return EINA_TRUE if successful, EINA_FALSE otherwise. diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c index 1d0409a..5710b41 100644 --- a/src/lib/edje/edje_edit.c +++ b/src/lib/edje/edje_edit.c @@ -910,6 +910,42 @@ edje_edit_compiler_get(Evas_Object *obj) /* SOUNDS API */ /****************/ +EAPI Eina_List * +edje_edit_sounds_samples_list_get(Evas_Object *obj) +{ + Eina_List *sounds_samples = NULL; + unsigned int i; + + GET_ED_OR_RETURN(NULL); + + if ((!ed->file) || (!ed->file->sound_dir)) + return NULL; + + for (i = 0; i < ed->file->sound_dir->samples_count; ++i) + sounds_samples = eina_list_append(sounds_samples, + eina_stringshare_add(ed->file->sound_dir->samples[i].name)); + + return sounds_samples; +} + +EAPI Eina_List * +edje_edit_sounds_tones_list_get(Evas_Object *obj) +{ + Eina_List *sounds_tones = NULL; + unsigned int i; + + GET_ED_OR_RETURN(NULL); + + if ((!ed->file) || (!ed->file->sound_dir)) + return NULL; + + for (i = 0; i < ed->file->sound_dir->tones_count; ++i) + sounds_tones = eina_list_append(sounds_tones, + eina_stringshare_add(ed->file->sound_dir->tones[i].name)); + + return sounds_tones; +} + static Eina_Bool _edje_edit_collection_save(Eet_File *eetf, Edje_Part_Collection *epc); static Eina_Bool @@ -1038,7 +1074,7 @@ edje_edit_sound_sample_add(Evas_Object *obj, const char* name, const char* snd_s sound_sample->id = id; sound_sample->mode = 0; sound_sample->quality = 0; - + return EINA_TRUE; } @@ -6573,45 +6609,6 @@ edje_edit_state_image_border_fill_set(Evas_Object *obj, const char *part, const return EINA_TRUE; } -/****************/ -/* SOUNDS API */ -/****************/ - -EAPI Eina_List * -edje_edit_sounds_samples_list_get(Evas_Object *obj) -{ - Eina_List *sounds_samples = NULL; - unsigned int i; - - GET_ED_OR_RETURN(NULL); - - if ((!ed->file) || (!ed->file->sound_dir)) - return NULL; - - for (i = 0; i < ed->file->sound_dir->samples_count; ++i) - sounds_samples = eina_list_append(sounds_samples, - eina_stringshare_add(ed->file->sound_dir->samples[i].name)); - - return sounds_samples; -} - -EAPI Eina_List * -edje_edit_sounds_tones_list_get(Evas_Object *obj) -{ - Eina_List *sounds_tones = NULL; - unsigned int i; - - GET_ED_OR_RETURN(NULL); - - if ((!ed->file) || (!ed->file->sound_dir)) - return NULL; - - for (i = 0; i < ed->file->sound_dir->tones_count; ++i) - sounds_tones = eina_list_append(sounds_tones, - eina_stringshare_add(ed->file->sound_dir->tones[i].name)); - - return sounds_tones; -} /******************/ /* PROGRAMS API */ --
