gst/goom/convolve_fx.c: Don't ever draw the GOOM logo.

Original commit message from CVS:
* gst/goom/convolve_fx.c: (convolve_apply):
Don't ever draw the GOOM logo.
Fixes: #528615

diff --git a/ChangeLog b/ChangeLog
index 6252d66a2f0d0da0125bf2f1e81afdaac0968910..4b263f1df50eea74e424d13612b6b75b2dac7f26 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-17  Jan Schmidt  <Jan.Schmidt@sun.com>
+
+       * gst/goom/convolve_fx.c: (convolve_apply):
+       Don't ever draw the GOOM logo.
+       Fixes: #528615
+
 2008-04-17  Edward Hervey  <edward.hervey@collabora.co.uk>
 
        * ext/cdio/gstcdiocddasrc.c:

diff --git a/gst/goom/convolve_fx.c b/gst/goom/convolve_fx.c
index 0e4666dd04cdd5e5767dec8c1f4c68c46354d556..d1b06d84f3cb75f8dc22420dd9ff9dd25d128fa0 100644 (file)
--- a/gst/goom/convolve_fx.c
+++ b/gst/goom/convolve_fx.c
@@ -9,6 +9,9 @@
 //#define CONV_MOTIF_W 32
 //#define CONV_MOTIF_WMASK 0x1f
 
+/* Define if you like the wacky GOOM logo: */
+#undef DRAW_MOTIF
+
 #define CONV_MOTIF_W 128
 #define CONV_MOTIF_WMASK 0x7f
 
@@ -119,6 +122,7 @@ convolve_free (VisualFX * _this)
   free (_this->fx_data);
 }
 
+#ifdef DRAW_MOTIF
 static void
 create_output_with_brightness (VisualFX * _this, Pixel * src, Pixel * dest,
     PluginInfo * info, int iff)
@@ -240,7 +244,7 @@ create_output_with_brightness (VisualFX * _this, Pixel * src, Pixel * dest,
 
   compute_tables (_this, info);
 }
-
+#endif
 
 /*#include <stdint.h>
 
@@ -302,11 +306,15 @@ convolve_apply (VisualFX * _this, Pixel * src, Pixel * dest, PluginInfo * info)
         break;
     }
   }
-
+#ifdef DRAW_MOTIF
   if ((ff > 0.98f) && (ff < 1.02f))
     memcpy (dest, src, info->screen.size * sizeof (Pixel));
   else
     create_output_with_brightness (_this, src, dest, info, iff);
+#else
+  memcpy (dest, src, info->screen.size * sizeof (Pixel));
+#endif
+
 /*
 //   Benching suite...
    {