2007-12-05 Emmanuele Bassi <ebassi@openedhand.com>

* clutter/clutter-score.h: Rearrange declarations.

	* clutter/clutter-score.c: More documentation in the long
	description of the ClutterScore section.

	* clutter/clutter-debug.h:
	* clutter/clutter-main.c: Add the CLUTTER_DEBUG_SHADER flag,
	for debugging the shader calls.

	* clutter/clutter-feature.h: Fix the documentation of the
	feature flags.

	* clutter/Makefile.am: Remove trailing whitespace.

ChangeLog

@@ -1,3 +1,19 @@
+2007-12-05  Emmanuele Bassi  <ebassi@openedhand.com>
+
+	* clutter/clutter-score.h: Rearrange declarations.
+
+	* clutter/clutter-score.c: More documentation in the long
+	description of the ClutterScore section.
+
+	* clutter/clutter-debug.h:
+	* clutter/clutter-main.c: Add the CLUTTER_DEBUG_SHADER flag,
+	for debugging the shader calls.
+
+	* clutter/clutter-feature.h: Fix the documentation of the
+	feature flags.
+
+	* clutter/Makefile.am: Remove trailing whitespace.
+
 2007-12-05  Tomas Frydrych  <tf@openedhand.com>
 
 	* clutter/clutter-actor.c:

clutter/Makefile.am

@@ -69,7 +69,7 @@ source_h =					\
 	$(srcdir)/clutter-score.h 		\
 	$(srcdir)/clutter-script.h		\
 	$(srcdir)/clutter-scriptable.h		\
-	$(srcdir)/clutter-shader.h		\	
+	$(srcdir)/clutter-shader.h		\
 	$(srcdir)/clutter-stage.h 		\
 	$(srcdir)/clutter-texture.h 		\
 	$(srcdir)/clutter-timeline.h 		\
@@ -154,7 +154,7 @@ source_c = \
 	clutter-script.c		\
 	clutter-script-parser.c		\
 	clutter-scriptable.c		\
-	clutter-shader.c		\	
+	clutter-shader.c		\
 	clutter-stage.c			\
 	clutter-texture.c 		\
 	clutter-timeline.c 		\

clutter/clutter-debug.h

@@ -18,7 +18,8 @@ typedef enum {
   CLUTTER_DEBUG_PANGO           = 1 << 8,
   CLUTTER_DEBUG_BACKEND         = 1 << 9,
   CLUTTER_DEBUG_SCHEDULER       = 1 << 10,
-  CLUTTER_DEBUG_SCRIPT          = 1 << 11
+  CLUTTER_DEBUG_SCRIPT          = 1 << 11,
+  CLUTTER_DEBUG_SHADER          = 1 << 12
 } ClutterDebugFlag;
 
 #ifdef CLUTTER_ENABLE_DEBUG

clutter/clutter-feature.h

@@ -46,7 +46,7 @@ G_BEGIN_DECLS
  * @CLUTTER_FEATURE_STAGE_STATIC: Set if stage size if fixed (i.e framebuffer)
  * @CLUTTER_FEATURE_STAGE_USER_RESIZE: Set if stage is able to be user resized.
  * @CLUTTER_FEATURE_STAGE_CURSOR: Set if stage has a graphical cursor.
- * @CLUTTER_FEATURE_SHADER_GLSL: Set if the backend supports GLSL shaders.
+ * @CLUTTER_FEATURE_SHADERS_GLSL: Set if the backend supports GLSL shaders.
  *
  * Runtime flags indicating specific features available via Clutter window
  * sysytem and graphics backend.

clutter/clutter-main.c

@@ -81,6 +81,7 @@ static const GDebugKey clutter_debug_keys[] = {
   { "backend", CLUTTER_DEBUG_BACKEND },
   { "scheduler", CLUTTER_DEBUG_SCHEDULER },
   { "script", CLUTTER_DEBUG_SCRIPT },
+  { "shader", CLUTTER_DEBUG_SHADER },
 };
 #endif /* CLUTTER_ENABLE_DEBUG */
 

clutter/clutter-score.c

@@ -54,9 +54,20 @@
  *   clutter_score_start ();
  * </programlisting></informalexample>
  *
+ * A #ClutterScore takes a reference on the timelines it manages.
+ *
  * New timelines can be added to the #ClutterScore using
  * clutter_score_append() and removed using clutter_score_remove().
  *
+ * The score can be cleared using clutter_score_remove_all().
+ *
+ * The list of timelines can be retrieved using
+ * clutter_score_list_timelines().
+ *
+ * The score state is controlled using clutter_score_start(),
+ * clutter_score_pause(), clutter_score_stop() and clutter_score_rewind().
+ * The state can be queried using clutter_score_is_playing().
+ *
  * #ClutterScore is available since Clutter 0.6
  */
 

clutter/clutter-score.h

@@ -79,7 +79,6 @@ ClutterScore *   clutter_score_new            (void);
 void             clutter_score_set_loop       (ClutterScore    *score,
                                                gboolean         loop);
 gboolean         clutter_score_get_loop       (ClutterScore    *score);
-gboolean         clutter_score_is_playing     (ClutterScore    *score);
 
 guint            clutter_score_append         (ClutterScore    *score, 
                                                ClutterTimeline *parent,
@@ -95,6 +94,7 @@ void             clutter_score_start          (ClutterScore    *score);
 void             clutter_score_stop           (ClutterScore    *score);
 void             clutter_score_pause          (ClutterScore    *score);
 void             clutter_score_rewind         (ClutterScore    *score);
+gboolean         clutter_score_is_playing     (ClutterScore    *score);
 
 G_END_DECLS