ext/libcaca/gstcacasink.c: Fix width and height properties.

Original commit message from CVS:
* ext/libcaca/gstcacasink.c: (gst_cacasink_class_init):
Fix width and height properties.
* ext/libcaca/gstcacasink.h:
Fix compilation on newer libcaca that require us to include a new
header. Fixes #379918.

diff --git a/ChangeLog b/ChangeLog
index a88aa95..bda46d9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2006-11-28  Wim Taymans  <wim@fluendo.com>
 
+       * ext/libcaca/gstcacasink.c: (gst_cacasink_class_init):
+       Fix width and height properties.
+
+       * ext/libcaca/gstcacasink.h:
+       Fix compilation on newer libcaca that require us to include a new
+       header. Fixes #379918.
+
+2006-11-28  Wim Taymans  <wim@fluendo.com>
+
        * gst/rtsp/gstrtspsrc.c: (gst_rtspsrc_open):
        * gst/rtsp/gstrtspsrc.h:
        * gst/rtsp/rtspext.h:

diff --git a/ext/libcaca/gstcacasink.c b/ext/libcaca/gstcacasink.c
index 1b4700d..525f007 100644 (file)
--- a/ext/libcaca/gstcacasink.c
+++ b/ext/libcaca/gstcacasink.c
@@ -149,13 +149,19 @@ gst_cacasink_class_init (GstCACASinkClass * klass)
   gobject_class->get_property = gst_cacasink_get_property;
   gstelement_class->change_state = gst_cacasink_change_state;
 
-  g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_SCREEN_WIDTH, g_param_spec_int ("screen-width", "screen_width", "screen_width", G_MININT, G_MAXINT, 0, G_PARAM_READABLE));       /* CHECKME */
-  g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_SCREEN_HEIGHT, g_param_spec_int ("screen-height", "screen_height", "screen_height", G_MININT, G_MAXINT, 0, G_PARAM_READABLE));   /* CHECKME */
+  g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_SCREEN_WIDTH,
+      g_param_spec_int ("screen-width", "Screen Width",
+          "The width of the screen", 0, G_MAXINT, GST_CACA_DEFAULT_SCREEN_WIDTH,
+          G_PARAM_READABLE));
+  g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_SCREEN_HEIGHT,
+      g_param_spec_int ("screen-height", "Screen Height",
+          "The height of the screen", 0, G_MAXINT,
+          GST_CACA_DEFAULT_SCREEN_HEIGHT, G_PARAM_READABLE));
   g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_DITHER,
       g_param_spec_enum ("dither", "Dither Type", "Set type of Dither",
           GST_TYPE_CACADITHER, CACA_DITHERING_NONE, G_PARAM_READWRITE));
   g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_ANTIALIASING,
-      g_param_spec_boolean ("anti-aliasing", "Anti-Aliasing",
+      g_param_spec_boolean ("anti-aliasing", "Anti Aliasing",
           "Enables Anti-Aliasing", TRUE, G_PARAM_READWRITE));
 
   gstbasesink_class->set_caps = GST_DEBUG_FUNCPTR (gst_cacasink_setcaps);

diff --git a/ext/libcaca/gstcacasink.h b/ext/libcaca/gstcacasink.h
index 0403b8b..f955f63 100644 (file)
--- a/ext/libcaca/gstcacasink.h
+++ b/ext/libcaca/gstcacasink.h
@@ -26,6 +26,9 @@
 #include <gst/video/video.h>
 
 #include <caca.h>
+#ifdef CACA_API_VERSION_1
+#   include <caca0.h>
+#endif
 
 #ifdef __cplusplus
 extern "C" {