From 412c01ca8d9dd67229bcada2740f52d0057fdd0a Mon Sep 17 00:00:00 2001
From: David Schleef <ds@schleef.org>
Date: Sun, 6 Jan 2008 22:35:31 +0000
Subject: ext/directfb/Makefile.am: Add GST_CFLAGS.  Otherwise we don't get
 -Wall -Werror.

Original commit message from CVS:
* ext/directfb/Makefile.am:
Add GST_CFLAGS.  Otherwise we don't get -Wall -Werror.
* ext/directfb/dfbvideosink.c:
Getting tired of directfb's chatter.  Quiet it.
---
 ext/directfb/Makefile.am    |  4 ++--
 ext/directfb/dfbvideosink.c | 12 +++++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'ext')

diff --git a/ext/directfb/Makefile.am b/ext/directfb/Makefile.am
index 7a6a65c6..6ad1a40f 100644
--- a/ext/directfb/Makefile.am
+++ b/ext/directfb/Makefile.am
@@ -3,8 +3,8 @@ plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
 plugin_LTLIBRARIES = libgstdfbvideosink.la
 
 libgstdfbvideosink_la_SOURCES =  dfbvideosink.c
-libgstdfbvideosink_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
-			       $(DIRECTFB_CFLAGS) $(LIBOIL_CFLAGS)
+libgstdfbvideosink_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
+			       $(DIRECTFB_CFLAGS)
 libgstdfbvideosink_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
 			       -lgstvideo-$(GST_MAJORMINOR) \
 			       -lgstinterfaces-$(GST_MAJORMINOR) \
diff --git a/ext/directfb/dfbvideosink.c b/ext/directfb/dfbvideosink.c
index 7f8f1092..bc715a59 100644
--- a/ext/directfb/dfbvideosink.c
+++ b/ext/directfb/dfbvideosink.c
@@ -581,10 +581,14 @@ gst_dfbvideosink_setup (GstDfbVideoSink * dfbvideosink)
         "DirectFB fullscreen");
     if (!dfbvideosink->dfb) {
       DFBGraphicsDeviceDescription hw_caps;
+      char *argv[] = { "-", "--dfb:quiet", NULL };
+      int argc = 2;
+      char **args;
 
       GST_DEBUG_OBJECT (dfbvideosink, "initializing DirectFB");
 
-      ret = DirectFBInit (0, NULL);
+      args = argv;
+      ret = DirectFBInit (&argc, &args);
 
       if (ret != DFB_OK) {
         GST_WARNING_OBJECT (dfbvideosink, "DirectFB initialization failed");
@@ -1570,7 +1574,9 @@ gst_dfbvideosink_show_frame (GstBaseSink * bsink, GstBuffer * buf)
     /* Center / Clip */
     gst_video_sink_center_rect (src, dst, &result, FALSE);
 
-    res = surface->GetSubSurface (surface, (DFBRectangle *) & result, &dest);
+    res =
+        surface->GetSubSurface (surface, (DFBRectangle *) (void *) &result,
+        &dest);
     if (res != DFB_OK) {
       GST_WARNING_OBJECT (dfbvideosink, "failed when getting a sub surface");
       ret = GST_FLOW_UNEXPECTED;
@@ -1639,7 +1645,7 @@ gst_dfbvideosink_show_frame (GstBaseSink * bsink, GstBuffer * buf)
 
     if (dfbvideosink->hw_scaling) {
       dfbvideosink->primary->StretchBlit (dfbvideosink->primary,
-          surface->surface, NULL, (DFBRectangle *) & result);
+          surface->surface, NULL, (DFBRectangle *) (void *) &result);
     } else {
       DFBRectangle clip;
 
-- 
cgit v1.2.1