diff options
| author | Emmanuele Bassi <ebassi@openedhand.com> | 2008-06-23 09:34:38 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@openedhand.com> | 2008-06-23 09:34:38 +0000 |
| commit | 883c1427440416fb7bf0d22a97117b6fa3239f73 (patch) | |
| tree | fad9c0a28dabeffe19a35a16f4f00e0d878ce5cf | |
| parent | 058460509f5e1f54cd76239ce9f73ac295ac0b1a (diff) | |
| download | clutter-gst-883c1427440416fb7bf0d22a97117b6fa3239f73.tar.gz | |
2008-06-23 Emmanuele Bassi <ebassi@openedhand.com>
Bug 978 - Inclusion of <gdk-pixbuf/gdk-pixbuf.h> in
clutter-gst-video-texture.h
* Makefile.am:
* clutter-gst/Makefile.am: Substitute 0.6 with 0.7.
* clutter-gst/clutter-gst-video-texture.h: Remove inclusion
of gdk-pixbuf.h: Clutter-GST does not depend on GdkPixbuf. (978,
Haakon Sporsheim)
* examples/video-player.c:
(input_cb): Use clutter_actor_get_transformed_position().
(main): Remove unused GdkPixbuf variable.
| -rw-r--r-- | ChangeLog | 17 | ||||
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | clutter-gst/Makefile.am | 2 | ||||
| -rw-r--r-- | clutter-gst/clutter-gst-video-texture.h | 1 | ||||
| -rw-r--r-- | examples/video-player.c | 7 |
5 files changed, 27 insertions, 8 deletions
@@ -1,3 +1,20 @@ +2008-06-23 Emmanuele Bassi <ebassi@openedhand.com> + + Bug 978 - Inclusion of <gdk-pixbuf/gdk-pixbuf.h> in + clutter-gst-video-texture.h + + * Makefile.am: + * clutter-gst/Makefile.am: Substitute 0.6 with 0.7. + + * clutter-gst/clutter-gst-video-texture.h: Remove inclusion + of gdk-pixbuf.h: Clutter-GST does not depend on GdkPixbuf. (978, + Haakon Sporsheim) + + * examples/video-player.c: + (input_cb): Use clutter_actor_get_transformed_position(). + + (main): Remove unused GdkPixbuf variable. + 2008-04-25 Matthew Allum <mallum@openedhand.com> * clutter-gst/clutter-gst-video-texture.c: diff --git a/Makefile.am b/Makefile.am index 7c5ee7d..4566f02 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,15 +6,15 @@ endif DIST_SUBDIRS = clutter-gst examples doc -clutter-gst-0.6.pc: clutter-gst.pc - @cp -f clutter-gst.pc clutter-gst-0.6.pc +clutter-gst-0.7.pc: clutter-gst.pc + @cp -f clutter-gst.pc clutter-gst-0.7.pc -pkgconfig_DATA = clutter-gst-0.6.pc +pkgconfig_DATA = clutter-gst-0.7.pc pkgconfigdir = $(libdir)/pkgconfig EXTRA_DIST = clutter-gst.pc.in -CLEANFILES = clutter-gst-0.6.pc +CLEANFILES = clutter-gst-0.7.pc DISTCLEANFILES = clutter-gst.pc diff --git a/clutter-gst/Makefile.am b/clutter-gst/Makefile.am index 164cf60..9db3f91 100644 --- a/clutter-gst/Makefile.am +++ b/clutter-gst/Makefile.am @@ -27,5 +27,5 @@ lib_LTLIBRARIES = libclutter-gst-@CLUTTER_GST_MAJORMINOR@.la libclutter_gst_@CLUTTER_GST_MAJORMINOR@_la_LIBADD = @CLUTTER_GST_LIBS@ $(GST_LIBS) libclutter_gst_@CLUTTER_GST_MAJORMINOR@_la_LDFLAGS = @CLUTTER_GST_LT_LDFLAGS@ -cluttergstheadersdir = $(includedir)/clutter-0.6/clutter-gst +cluttergstheadersdir = $(includedir)/clutter-0.7/clutter-gst cluttergstheaders_HEADERS = $(source_h) clutter-gst.h diff --git a/clutter-gst/clutter-gst-video-texture.h b/clutter-gst/clutter-gst-video-texture.h index 40891af..d9863c5 100644 --- a/clutter-gst/clutter-gst-video-texture.h +++ b/clutter-gst/clutter-gst-video-texture.h @@ -32,7 +32,6 @@ #include <glib-object.h> #include <clutter/clutter.h> #include <gst/gstelement.h> -#include <gdk-pixbuf/gdk-pixbuf.h> G_BEGIN_DECLS diff --git a/examples/video-player.c b/examples/video-player.c index 10dba01..1dd5fd0 100644 --- a/examples/video-player.c +++ b/examples/video-player.c @@ -1,3 +1,6 @@ +#include <stdlib.h> + +#include <clutter/clutter.h> #include <clutter-gst/clutter-gst.h> #define SEEK_H 20 @@ -145,7 +148,8 @@ input_cb (ClutterStage *stage, { gint x, y, dist, pos; - clutter_actor_get_abs_position (app->control_seekbar, &x, &y); + clutter_actor_get_transformed_position (app->control_seekbar, + &x, &y); dist = bev->x - x; @@ -261,7 +265,6 @@ main (int argc, char *argv[]) ClutterColor stage_color = { 0x00, 0x00, 0x00, 0x00 }; ClutterColor control_color1 = { 73, 74, 77, 0xee }; ClutterColor control_color2 = { 0xcc, 0xcc, 0xcc, 0xff }; - GdkPixbuf *pixb; gint x,y; if (argc < 2) |