diff --git a/demos/music/lv_demo_music_main.c b/demos/music/lv_demo_music_main.c index 354c067ab4..351b4c9181 100644 --- a/demos/music/lv_demo_music_main.c +++ b/demos/music/lv_demo_music_main.c @@ -305,7 +305,7 @@ lv_obj_t * _lv_demo_music_main_create(lv_obj_t * parent) lv_anim_set_duration(&a, 400); lv_anim_set_delay(&a, INTRO_TIME + 800); lv_anim_set_values(&a, LV_SCALE_NONE, 10); - lv_anim_set_completed_cb(&a, lv_obj_delete_anim_ready_cb); + lv_anim_set_completed_cb(&a, lv_obj_delete_anim_completed_cb); lv_anim_start(&a); lv_obj_update_layout(main_cont); @@ -713,14 +713,13 @@ static void track_load(uint32_t id) } #endif lv_anim_set_exec_cb(&a, _obj_set_x_anim_cb); - lv_anim_set_completed_cb(&a, lv_obj_delete_anim_ready_cb); + lv_anim_set_completed_cb(&a, lv_obj_delete_anim_completed_cb); lv_anim_start(&a); lv_anim_set_path_cb(&a, lv_anim_path_linear); lv_anim_set_var(&a, album_image_obj); lv_anim_set_duration(&a, 500); lv_anim_set_values(&a, LV_SCALE_NONE, LV_SCALE_NONE / 2); - lv_anim_set_exec_cb(&a, _image_set_scale_anim_cb); lv_anim_set_completed_cb(&a, NULL); lv_anim_start(&a); diff --git a/demos/widgets/lv_demo_widgets.c b/demos/widgets/lv_demo_widgets.c index d3c2f131cf..01803eac63 100644 --- a/demos/widgets/lv_demo_widgets.c +++ b/demos/widgets/lv_demo_widgets.c @@ -54,7 +54,7 @@ static void scale3_anim_cb(void * var, int32_t v); static void scroll_anim_y_cb(void * var, int32_t v); static void scroll_anim_y_cb(void * var, int32_t v); static void delete_timer_event_cb(lv_event_t * e); -static void slideshow_anim_ready_cb(lv_anim_t * a_old); +static void slideshow_anim_completed_cb(lv_anim_t * a_old); static void scale3_delete_event_cb(lv_event_t * e); static void tabview_delete_event_cb(lv_event_t * e); @@ -233,7 +233,7 @@ void lv_demo_widgets_start_slideshow(void) lv_anim_set_playback_duration(&a, t); lv_anim_set_values(&a, 0, v); lv_anim_set_var(&a, tab); - lv_anim_set_completed_cb(&a, slideshow_anim_ready_cb); + lv_anim_set_completed_cb(&a, slideshow_anim_completed_cb); lv_anim_start(&a); } @@ -1637,7 +1637,7 @@ static void delete_timer_event_cb(lv_event_t * e) } } -static void slideshow_anim_ready_cb(lv_anim_t * a_old) +static void slideshow_anim_completed_cb(lv_anim_t * a_old) { LV_UNUSED(a_old); @@ -1661,7 +1661,7 @@ static void slideshow_anim_ready_cb(lv_anim_t * a_old) lv_anim_set_playback_duration(&a, t); lv_anim_set_values(&a, 0, v); lv_anim_set_var(&a, tab); - lv_anim_set_completed_cb(&a, slideshow_anim_ready_cb); + lv_anim_set_completed_cb(&a, slideshow_anim_completed_cb); lv_anim_start(&a); } diff --git a/src/core/lv_obj_scroll.c b/src/core/lv_obj_scroll.c index b9d6f73668..f21ebc5134 100644 --- a/src/core/lv_obj_scroll.c +++ b/src/core/lv_obj_scroll.c @@ -33,7 +33,7 @@ **********************/ static void scroll_x_anim(void * obj, int32_t v); static void scroll_y_anim(void * obj, int32_t v); -static void scroll_completed_ready_cb(lv_anim_t * a); +static void scroll_completed_completed_cb(lv_anim_t * a); static void scroll_area_into_view(const lv_area_t * area, lv_obj_t * child, lv_point_t * scroll_value, lv_anim_enable_t anim_en); @@ -309,7 +309,7 @@ void lv_obj_scroll_by(lv_obj_t * obj, int32_t dx, int32_t dy, lv_anim_enable_t a lv_anim_t a; lv_anim_init(&a); lv_anim_set_var(&a, obj); - lv_anim_set_completed_cb(&a, scroll_completed_ready_cb); + lv_anim_set_completed_cb(&a, scroll_completed_completed_cb); if(dx) { uint32_t t = lv_anim_speed_clamped((lv_display_get_horizontal_resolution(d)) >> 1, SCROLL_ANIM_TIME_MIN, @@ -675,7 +675,7 @@ static void scroll_y_anim(void * obj, int32_t v) _lv_obj_scroll_by_raw(obj, 0, v + lv_obj_get_scroll_y(obj)); } -static void scroll_completed_ready_cb(lv_anim_t * a) +static void scroll_completed_completed_cb(lv_anim_t * a) { lv_obj_send_event(a->var, LV_EVENT_SCROLL_END, NULL); } diff --git a/src/lv_api_map.h b/src/lv_api_map.h index 987d0a8dc9..b69504a4fc 100644 --- a/src/lv_api_map.h +++ b/src/lv_api_map.h @@ -207,6 +207,7 @@ static inline void lv_obj_move_background(lv_obj_t * obj) #define lv_obj_get_child_cnt lv_obj_get_child_count #define lv_obj_get_disp lv_obj_get_display +#define lv_obj_delete_anim_ready_cb lv_obj_delete_anim_completed_cb #define LV_STYLE_ANIM_TIME LV_STYLE_ANIM_DURATION #define LV_STYLE_IMG_OPA LV_STYLE_IMAGE_OPA diff --git a/src/misc/lv_anim.c b/src/misc/lv_anim.c index a9c2db2964..8d88372a2a 100644 --- a/src/misc/lv_anim.c +++ b/src/misc/lv_anim.c @@ -417,7 +417,7 @@ static void anim_completed_handler(lv_anim_t * a) if(a->repeat_cnt == 0 && (a->playback_duration == 0 || a->playback_now == 1)) { /*Delete the animation from the list. - * This way the `ready_cb` will see the animations like it's animation is ready deleted*/ + * This way the `completed_cb` will see the animations like it's animation is already deleted*/ _lv_ll_remove(anim_ll_p, a); /*Flag that the list has changed*/ anim_mark_list_change(); diff --git a/tests/src/lv_test_conf_full.h b/tests/src/lv_test_conf_full.h index 114a58fc40..50da0267e3 100644 --- a/tests/src/lv_test_conf_full.h +++ b/tests/src/lv_test_conf_full.h @@ -88,6 +88,7 @@ #define LV_USE_DEMO_TRANSFORM 1 #define LV_USE_DEMO_MULTILANG 1 #define LV_USE_DEMO_RENDER 1 +#define LV_USE_DEMO_MUSIC 1 #define LV_USE_DEMO_BENCHMARK 1 #define LV_USE_DEMO_SCROLL 1 #define LV_USE_DEMO_VECTOR_GRAPHIC 1