2006-06-22 Emmanuele Bassi <ebassi@openedhand.com>

* clutter/clutter-timeline.h:
	* clutter/clutter-timeline.c: Add a "started" and a "paused"
	signals; add more sanity checks on the public functions.
	
	(clutter_timeline_get_loop): Add a getter function for the
	loop property.

	* clutter/clutter-marshal.list: Add marshallers.

	* clutter/clutter-timeline.h:
	* clutter/clutter-actor.h: Add padding for future expansion
	without breaking ABI.

bindings/python/Makefile.am

@@ -48,7 +48,7 @@ clutter-pyglue.c: clutter.defs clutter-types.defs $(CLUTTER_OVERRIDES)
         --register $(PYGTK_DEFSDIR)/gdk-types.defs	\
         --register $(PYGTK_DEFSDIR)/gtk-types.defs	\
         --register $(PYGTK_DEFSDIR)/pango-types.defs	\
-        --register clutter-types.defs			\
+	--register clutter-types.defs			\
 	--override $(top_srcdir)/bindings/python/$(CLUTTER_OVERRIDES)	\
 	--prefix clutter				\
         clutter.defs > gen-$@ &&			\
@@ -65,10 +65,12 @@ pkgconfig_DATA = pyclutter.pc
 
 EXTRA_DIST += pyclutter.pc.in
 
-INCLUDES = $(PYTHON_CFLAGS) $(PYGTK_CFLAGS) -I$(top_srcdir) $(CLUTTER_CFLAGS)
+INCLUDES = $(PYTHON_CFLAGS) $(PYGTK_CFLAGS) -I$(top_srcdir) $(GST_CFLAGS) $(CLUTTER_CFLAGS)
 
 clutter_la_SOURCES = clutter-pyglue.c cluttermodule.c
 clutter_la_LIBADD  = $(PYTHON_LIBS) $(PYGTK_LIBS) \
+		     $(GST_LIBS) \
+		     $(CLUTTER_LIBS) \
                      $(top_builddir)/clutter/libclutter-@CLUTTER_MAJORMINOR@.la
 clutter_la_LDFLAGS = -module avoid-version -export-symbols-regex initclutter
 
@@ -80,11 +82,13 @@ update-defs:
 	$(PYTHON) $(PYGTK_CODEGENDIR)/h2def.py -v       \
 		$(top_srcdir)/clutter/clutter-keysyms.h         \
 		$(top_srcdir)/clutter/clutter-timeline.h        \
+		$(top_srcdir)/clutter/clutter-media.h		\
 		$(top_srcdir)/clutter/clutter-main.h            \
 		$(top_srcdir)/clutter/clutter-event.h           \
 		$(top_srcdir)/clutter/clutter-actor.h         \
 		$(top_srcdir)/clutter/clutter-rectangle.h       \
 		$(top_srcdir)/clutter/clutter-texture.h         \
+		$(top_srcdir)/clutter/clutter-video-texture.h	\
 		$(top_srcdir)/clutter/clutter-color.h           \
 		$(top_srcdir)/clutter/clutter-clone-texture.h   \
 		$(top_srcdir)/clutter/clutter-label.h           \

bindings/python/clutter-base-types.defs

@@ -77,6 +77,15 @@
   )
 )
 
+;; Interfaces
+
+(define-interface Media
+  (in-module "Clutter")
+  (c-name "ClutterMedia")
+  (gtype-id "CLUTTER_TYPE_MEDIA")
+  (vtable "ClutterMediaInterface")
+)
+
 ;; Objects
 
 (define-object CloneTexture
@@ -135,6 +144,15 @@
   (gtype-id "CLUTTER_TYPE_TIMELINE")
 )
 
+(define-object VideoTexture
+  (in-module "Clutter")
+  (parent "ClutterTexture")
+  (implements "ClutterMedia")
+  (c-name "ClutterVideoTexture")
+  (gtype-id "CLUTTER_TYPE_VIDEO_TEXTURE")
+)
+
+
 ;; Pointers
 
 

bindings/python/clutter-base.defs

@@ -59,6 +59,12 @@
   )
 )
 
+(define-method get_loop
+  (of-object "ClutterTimeline")
+  (c-name "clutter_timeline_get_loop")
+  (return-type "gboolean")
+)
+
 (define-method rewind
   (of-object "ClutterTimeline")
   (c-name "clutter_timeline_rewind")
@@ -162,6 +168,102 @@
 
 
 
+;; From ../../clutter/clutter-media.h
+
+(define-function clutter_media_get_type
+  (c-name "clutter_media_get_type")
+  (return-type "GType")
+)
+
+(define-method set_uri
+  (of-object "ClutterMedia")
+  (c-name "clutter_media_set_uri")
+  (return-type "none")
+  (parameters
+    '("const-char*" "uri")
+  )
+)
+
+(define-method get_uri
+  (of-object "ClutterMedia")
+  (c-name "clutter_media_get_uri")
+  (return-type "const-char*")
+)
+
+(define-method set_playing
+  (of-object "ClutterMedia")
+  (c-name "clutter_media_set_playing")
+  (return-type "none")
+  (parameters
+    '("gboolean" "playing")
+  )
+)
+
+(define-method get_playing
+  (of-object "ClutterMedia")
+  (c-name "clutter_media_get_playing")
+  (return-type "gboolean")
+)
+
+(define-method set_position
+  (of-object "ClutterMedia")
+  (c-name "clutter_media_set_position")
+  (return-type "none")
+  (parameters
+    '("int" "position")
+  )
+)
+
+(define-method get_position
+  (of-object "ClutterMedia")
+  (c-name "clutter_media_get_position")
+  (return-type "int")
+)
+
+(define-method set_volume
+  (of-object "ClutterMedia")
+  (c-name "clutter_media_set_volume")
+  (return-type "none")
+  (parameters
+    '("double" "volume")
+  )
+)
+
+(define-method get_volume
+  (of-object "ClutterMedia")
+  (c-name "clutter_media_get_volume")
+  (return-type "double")
+)
+
+(define-method get_can_seek
+  (of-object "ClutterMedia")
+  (c-name "clutter_media_get_can_seek")
+  (return-type "gboolean")
+)
+
+(define-method get_buffer_percent
+  (of-object "ClutterMedia")
+  (c-name "clutter_media_get_buffer_percent")
+  (return-type "int")
+)
+
+(define-method get_duration
+  (of-object "ClutterMedia")
+  (c-name "clutter_media_get_duration")
+  (return-type "int")
+)
+
+(define-method set_filename
+  (of-object "ClutterMedia")
+  (c-name "clutter_media_set_filename")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "filename")
+  )
+)
+
+
+
 ;; From ../../clutter/clutter-event.h
 
 (define-function clutter_event_new
@@ -685,6 +787,21 @@
 
 
 
+;; From ../../clutter/clutter-video-texture.h
+
+(define-function clutter_video_texture_get_type
+  (c-name "clutter_video_texture_get_type")
+  (return-type "GType")
+)
+
+(define-function clutter_video_texture_new
+  (c-name "clutter_video_texture_new")
+  (is-constructor-of "ClutterVideoTexture")
+  (return-type "ClutterActor*")
+)
+
+
+
 ;; From ../../clutter/clutter-color.h
 
 (define-function clutter_color_get_type

bindings/python/clutter.override

@@ -5,6 +5,7 @@ headers
 #include "pygobject.h"
 #include <clutter/clutter-keysyms.h>
 #include <clutter/clutter-event.h>
+#include <clutter/clutter-media.h>
 #include <clutter/clutter-main.h>
 #include <clutter/clutter-timeline.h>
 #include <clutter/clutter-stage.h>
@@ -13,6 +14,7 @@ headers
 #include <clutter/clutter-rectangle.h>
 #include <clutter/clutter-group.h>
 #include <clutter/clutter-texture.h>
+#include <clutter/clutter-video-texture.h>
 #include <clutter/clutter-clone-texture.h>
 #include <clutter/clutter-label.h>
 #include <clutter/clutter-util.h>