diff --git a/ChangeLog b/ChangeLog index 32c77e71e..bd439e55c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2008-11-14 Emmanuele Bassi + + Bug 1265 - ClutterScore doesn't emit 'started' signal (Bastian + Winkler) + + * clutter/clutter-score.c: Emit the ::started signal. + + * tests/interactive/test-score.c: Check the emission of the + Score signals. + 2008-11-13 Neil Roberts * clutter/cogl/gles/cogl-gles2-wrapper.h: diff --git a/clutter/clutter-score.c b/clutter/clutter-score.c index dfc8443dc..c99255a9e 100644 --- a/clutter/clutter-score.c +++ b/clutter/clutter-score.c @@ -768,6 +768,7 @@ clutter_score_start (ClutterScore *score) } else { + g_signal_emit (score, score_signals[STARTED], 0); g_node_children_foreach (priv->root, G_TRAVERSE_ALL, start_children_entries, diff --git a/tests/interactive/test-score.c b/tests/interactive/test-score.c index c6493476e..27d5c2f9e 100644 --- a/tests/interactive/test-score.c +++ b/tests/interactive/test-score.c @@ -5,6 +5,19 @@ static gint level = 1; +static void +on_score_started (ClutterScore *score) +{ + g_print ("Score started\n"); +} + +static void +on_score_completed (ClutterScore *score) +{ + g_print ("Score completed\n"); + clutter_main_quit (); +} + static void on_timeline_started (ClutterScore *score, ClutterTimeline *timeline) @@ -75,6 +88,9 @@ test_score_main (int argc, char **argv) g_free); score = clutter_score_new(); + g_signal_connect (score, "started", + G_CALLBACK (on_score_started), + NULL); g_signal_connect (score, "timeline-started", G_CALLBACK (on_timeline_started), NULL); @@ -82,7 +98,7 @@ test_score_main (int argc, char **argv) G_CALLBACK (on_timeline_completed), NULL); g_signal_connect (score, "completed", - G_CALLBACK (clutter_main_quit), + G_CALLBACK (on_score_completed), NULL); clutter_score_append (score, NULL, timeline_1);