Index: configure.ac
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-good/configure.ac,v
retrieving revision 1.723
diff -u -p -u -p -r1.723 configure.ac
--- configure.ac	7 Feb 2008 10:17:14 -0000	1.723
+++ configure.ac	7 Feb 2008 20:44:32 -0000
@@ -44,6 +44,8 @@ dnl So this needs to be fixed first if w
 dnl AS_LIBTOOL_TAGS
 
 AM_PROG_LIBTOOL
+AM_PROG_LEX
+AC_PROG_YACC
 
 dnl *** required versions of GStreamer stuff ***
 GST_REQ=0.10.17
Index: gst/goom/Makefile.am
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-good/gst/goom/Makefile.am,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 Makefile.am
--- gst/goom/Makefile.am	24 Feb 2007 22:57:48 -0000	1.17
+++ gst/goom/Makefile.am	7 Feb 2008 20:44:32 -0000
@@ -2,11 +2,24 @@ plugin_LTLIBRARIES = libgstgoom.la
 
 GOOM_FILTER_FILES = filters.c
 GOOM_FILTER_CFLAGS = -UMMX -UUSE_ASM
+AM_YFLAGS=-d
 
-noinst_HEADERS = gstgoom.h filters.h goom_core.h goom_tools.h graphic.h lines.h 
+noinst_HEADERS = goom.h goom_plugin_info.h goom_typedefs.h goom_graphic.h goom_config_param.h goom_visual_fx.h goom_filters.h goom_tools.h goomsl.h goomsl_hash.h goomsl_heap.h goom_tools.h goom_config.h mmx.h
 
-libgstgoom_la_SOURCES = gstgoom.c goom_core.c $(GOOM_FILTER_FILES) graphic.c lines.c
+#libgstgoom_la_SOURCES = gstgoom.c goom_core.c $(GOOM_FILTER_FILES) graphic.c lines.c
 
+libgstgoom_la_SOURCES = gstgoom.c \
+	goomsl_yacc.y goomsl_lex.l goomsl.c goomsl_hash.c goomsl_heap.c \
+	goom_tools.c $(MMX_FILES) $(PPC_FILES) \
+	config_param.c convolve_fx.c filters.c \
+	flying_stars_fx.c gfontlib.c gfontrle.c \
+	goom_core.c graphic.c ifs.c lines.c \
+	mathtools.c sound_tester.c surf3d.c \
+	tentacle3d.c plugin_info.c \
+	v3d.c drawmethods.c \
+	cpu_info.c
+
+ERROR_CFLAGS=
 libgstgoom_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GOOM_FILTER_CFLAGS)
 libgstgoom_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM)
 libgstgoom_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
Index: gst/goom/gstgoom.c
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-good/gst/goom/gstgoom.c,v
retrieving revision 1.63
diff -u -p -u -p -r1.63 gstgoom.c
--- gst/goom/gstgoom.c	6 Mar 2007 13:21:23 -0000	1.63
+++ gst/goom/gstgoom.c	7 Feb 2008 20:44:33 -0000
@@ -44,7 +44,7 @@
 #include <gst/gst.h>
 #include "gstgoom.h"
 #include <gst/video/video.h>
-#include "goom_core.h"
+#include "goom.h"
 
 GST_DEBUG_CATEGORY_STATIC (goom_debug);
 #define GST_CAT_DEFAULT goom_debug
@@ -187,7 +187,7 @@ gst_goom_init (GstGoom * goom)
   goom->rate = 0;
   goom->duration = 0;
 
-  goom_init (&(goom->goomdata), goom->width, goom->height);
+  goom->plugin = goom_init (goom->width, goom->height);
 }
 
 static void
@@ -195,7 +195,7 @@ gst_goom_finalize (GObject * object)
 {
   GstGoom *goom = GST_GOOM (object);
 
-  goom_close (&(goom->goomdata));
+  goom_close (goom->plugin);
 
   g_object_unref (goom->adapter);
 
@@ -250,7 +250,7 @@ gst_goom_src_setcaps (GstPad * pad, GstC
           &goom->fps_d))
     return FALSE;
 
-  goom_set_resolution (&(goom->goomdata), goom->width, goom->height);
+  goom_set_resolution (goom->plugin, goom->width, goom->height);
 
   /* size of the output buffer in bytes, depth is always 4 bytes */
   goom->outsize = goom->width * goom->height * 4;
@@ -523,7 +523,8 @@ gst_goom_chain (GstPad * pad, GstBuffer 
     GST_BUFFER_DURATION (outbuf) = goom->duration;
     GST_BUFFER_SIZE (outbuf) = goom->outsize;
 
-    out_frame = (guchar *) goom_update (&(goom->goomdata), goom->datain);
+    out_frame = (guchar *) goom_update (goom->plugin, goom->datain, 0, 0,
+					NULL, NULL);
     memcpy (GST_BUFFER_DATA (outbuf), out_frame, goom->outsize);
 
     GST_DEBUG ("Pushing frame with time=%" GST_TIME_FORMAT ", duration=%"
Index: gst/goom/gstgoom.h
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-good/gst/goom/gstgoom.h,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 gstgoom.h
--- gst/goom/gstgoom.h	6 Mar 2007 13:21:23 -0000	1.7
+++ gst/goom/gstgoom.h	7 Feb 2008 20:44:33 -0000
@@ -24,7 +24,7 @@ G_BEGIN_DECLS
 
 #include <gst/gst.h>
 #include <gst/base/gstadapter.h>
-#include "goom_core.h"
+#include "goom.h"
 
 #define GOOM_SAMPLES 512
 
@@ -65,7 +65,7 @@ struct _GstGoom
 
   /* goom stuff */
   gint16 datain[2][GOOM_SAMPLES];
-  GoomData goomdata;
+  PluginInfo *plugin;
 
   /* segment state */
   GstSegment segment;
