commit 9d1b1125fd30c6d78cd6e8e8220729c97a914639
author Scott Moreau <oreaus@gmail.com> Fri Jun 08 19:40:53 2012 -0600
committer Kristian Høgsberg <krh@bitplanet.net> Mon Jun 11 09:32:47 2012 -0400
tree 32b6784d5934e4917ba08edba39126abdd0d028a
parent c3a13cc6cf0c30cd80051379b1bc6cabd49cd592

Move animation_list to weston_output.

src/compositor.c

diff --git a/src/compositor.c b/src/compositor.c
index 700f31b..d706b41 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -1060,7 +1060,7 @@
 		wl_resource_destroy(&cb->resource);
 	}
 
-	wl_list_for_each_safe(animation, next, &ec->animation_list, link)
+	wl_list_for_each_safe(animation, next, &output->animation_list, link)
 		animation->frame(animation, output, msecs);
 }
 
@@ -1142,9 +1142,13 @@
 WL_EXPORT void
 weston_compositor_fade(struct weston_compositor *compositor, float tint)
 {
+	struct weston_output *output;
 	struct weston_surface *surface;
 	int done;
 
+	output = container_of(compositor->output_list.next,
+                             struct weston_output, link);
+
 	done = weston_spring_done(&compositor->fade.spring);
 	compositor->fade.spring.target = tint;
 	if (weston_spring_done(&compositor->fade.spring))
@@ -1167,7 +1171,7 @@
 
 	weston_surface_damage(compositor->fade.surface);
 	if (wl_list_empty(&compositor->fade.animation.link))
-		wl_list_insert(compositor->animation_list.prev,
+		wl_list_insert(output->animation_list.prev,
 			       &compositor->fade.animation.link);
 }
 
@@ -2840,6 +2844,7 @@
 
 	wl_signal_init(&output->frame_signal);
 	wl_list_init(&output->frame_callback_list);
+	wl_list_init(&output->animation_list);
 	wl_list_init(&output->resource_list);
 
 	output->id = ffs(~output->compositor->output_id_pool) - 1;
@@ -2990,7 +2995,6 @@
 	wl_list_init(&ec->key_binding_list);
 	wl_list_init(&ec->button_binding_list);
 	wl_list_init(&ec->axis_binding_list);
-	wl_list_init(&ec->animation_list);
 	weston_spring_init(&ec->fade.spring, 30.0, 1.0, 1.0);
 	ec->fade.animation.frame = fade_frame;
 	wl_list_init(&ec->fade.animation.link);