gnomemm r1289 - in cluttermm/trunk: . clutter/src

[jjongsma svn gnome org]

Author: jjongsma
Date: Sun Jan 20 16:47:09 2008
New Revision: 1289
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1289&view=rev

Log:
	* clutter/src/score.ccg:
	* clutter/src/score.hg:
	* clutter/src/Makefile_list_of_hg.am_fragment: add new Score class
	* clutter/src/clutter_docs_override.xml: override some documentation for the
	Score class since I overloaded append() with a NULL parameter for parent



Added:
   cluttermm/trunk/clutter/src/score.ccg
   cluttermm/trunk/clutter/src/score.hg
Modified:
   cluttermm/trunk/ChangeLog
   cluttermm/trunk/clutter/src/Makefile_list_of_hg.am_fragment
   cluttermm/trunk/clutter/src/clutter_docs_override.xml

Modified: cluttermm/trunk/clutter/src/Makefile_list_of_hg.am_fragment
==============================================================================
--- cluttermm/trunk/clutter/src/Makefile_list_of_hg.am_fragment	(original)
+++ cluttermm/trunk/clutter/src/Makefile_list_of_hg.am_fragment	Sun Jan 20 16:47:09 2008
@@ -24,5 +24,6 @@
 behaviour-path.hg \
 behaviour-ellipse.hg \
 behaviour-rotate.hg \
-behaviour-scale.hg
+behaviour-scale.hg \
+score.hg
 #layout.hg box.hg margin.hg

Modified: cluttermm/trunk/clutter/src/clutter_docs_override.xml
==============================================================================
--- cluttermm/trunk/clutter/src/clutter_docs_override.xml	(original)
+++ cluttermm/trunk/clutter/src/clutter_docs_override.xml	Sun Jan 20 16:47:09 2008
@@ -1,2 +1,28 @@
 <root>
+<function name="clutter_score_append">
+<description>
+    Appends a timeline to another one existing in the score; the newly appended
+    timeline will be started when parent is complete.
+</description>
+<parameters>
+<parameter name="score">
+<parameter_description> a #ClutterScore
+</parameter_description>
+</parameter>
+<parameter name="parent">
+<parameter_description> a #ClutterTimeline in the score
+</parameter_description>
+</parameter>
+<parameter name="timeline">
+<parameter_description> a #ClutterTimeline
+</parameter_description>
+</parameter>
+</parameters>
+<return> the id of the newly added timeline, to be used with
+clutter_score_get_timeline() and clutter_score_remove().
+
+Since: 0.6
+</return>
+</function>
+
 </root>

Added: cluttermm/trunk/clutter/src/score.ccg
==============================================================================
--- (empty file)
+++ cluttermm/trunk/clutter/src/score.ccg	Sun Jan 20 16:47:09 2008
@@ -0,0 +1,29 @@
+/* Copyright (C) 2007 The cluttermm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <clutter/clutter-score.h>
+
+namespace Clutter
+{
+
+guint Score::append(const Glib::RefPtr<Timeline>& timeline)
+{
+    return clutter_score_append(gobj(), NULL, timeline->gobj());
+}
+
+} //namespace Clutter
+

Added: cluttermm/trunk/clutter/src/score.hg
==============================================================================
--- (empty file)
+++ cluttermm/trunk/clutter/src/score.hg	Sun Jan 20 16:47:09 2008
@@ -0,0 +1,67 @@
+/* Copyright (C) 2007 The cluttermm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <glibmm/object.h>
+#include <cluttermm/timeline.h>
+#include <clutter/clutter-score.h>
+ 
+_DEFS(cluttermm,clutter)
+_PINCLUDE(glibmm/private/object_p.h)
+
+
+namespace Clutter
+{
+
+class Score : public Glib::Object
+{
+  _CLASS_GOBJECT(Score, ClutterScore, CLUTTER_SCORE, Glib::Object, GObject)
+  _DERIVES_INITIALLY_UNOWNED()
+
+protected:
+  _CTOR_DEFAULT()
+
+public:
+  _WRAP_CREATE()
+
+  _WRAP_METHOD(void set_loop(bool loop), clutter_score_set_loop)
+  _WRAP_METHOD(bool get_loop() const, clutter_score_get_loop)
+
+  _WRAP_METHOD(guint append(const Glib::RefPtr<Timeline>& parent, const Glib::RefPtr<Timeline>& timeline), clutter_score_append)
+  /**
+   * Appends a timeline to another one existing in the score; the new timeline
+   * will be started when start() is called
+   *
+   * @param timeline the Timeline to append
+   * @return the id of the newly added timeline, to be used with get_timeline() and remove().
+   *
+   * @since 0.6 
+   */
+  guint append(const Glib::RefPtr<Timeline>& timeline);
+  _WRAP_METHOD(void remove(guint id), clutter_score_remove)
+  _WRAP_METHOD(void remove_all(), clutter_score_remove_all)
+  _WRAP_METHOD(Glib::RefPtr<Timeline> get_timeline(guint id), clutter_score_get_timeline)
+  _WRAP_METHOD(Glib::RefPtr<const Timeline> get_timeline(guint id) const, clutter_score_get_timeline, CONSTVERSION)
+  _WRAP_METHOD(void start(), clutter_score_start)
+  _WRAP_METHOD(void pause(), clutter_score_pause)
+  _WRAP_METHOD(void stop(), clutter_score_stop)
+  _WRAP_METHOD(void rewind(), clutter_score_rewind)
+  _WRAP_METHOD(bool is_playing() const, clutter_score_is_playing)
+
+};
+
+} // namespace Clutter
+// vim:ts=2,sw=2