diff --git a/Makefile.am b/Makefile.am index 50801b047f..3dfc9c800f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ -SUBDIRS=gst sys ext gst-libs +SUBDIRS=gst-libs gst sys ext -DIST_SUBDIRS=gst sys ext gst-libs +DIST_SUBDIRS=gst-libs gst sys ext EXTRA_DIST=gst-plugins.spec AUTHORS COPYING README ChangeLog diff --git a/configure.ac b/configure.ac index 7c5888d967..c037fbb8ae 100644 --- a/configure.ac +++ b/configure.ac @@ -311,6 +311,21 @@ AC_ARG_WITH(plugins, AC_SUBST(GST_PLUGINS_SELECTED) +dnl needed for smoothwave, FIXME! +if test x$USE_GLIB2 = xno; then + AM_PATH_GTK(1.2.0,, + AC_MSG_ERROR(Cannot find gtk: Is gtk-config in path?)) + HAVE_GTK=yes + # we have to have it +else + PKG_CHECK_MODULES(GTK2, gtk+-2.0, HAVE_GTK=yes, HAVE_GTK=no) + + GTK_CFLAGS=$GTK2_CFLAGS + GTK_LIBS=$GTK2_LIBS +fi +AC_SUBST(GTK_LIBS) +AC_SUBST(GTK_CFLAGS) + dnl ========================================================================== dnl ============================= sys plugins ================================ dnl ========================================================================== @@ -1076,7 +1091,6 @@ sys/vcd/Makefile sys/vga/Makefile sys/xvideo/Makefile ext/Makefile -ext/a52/Makefile ext/aalib/Makefile ext/alsa/Makefile ext/audiofile/Makefile @@ -1088,6 +1102,7 @@ ext/vorbis/Makefile gst-libs/Makefile gst-libs/gst/Makefile gst-libs/gst/audio/Makefile +gst-libs/gst/resample/Makefile gst-plugins.spec ) diff --git a/ext/Makefile.am b/ext/Makefile.am index ff91846e69..0edd708f54 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -1,8 +1,8 @@ -if USE_A52 -A52_DIR=a52 -else -A52_DIR= -endif +#if USE_A52 +#A52_DIR=a52 +#else +#A52_DIR= +#endif if USE_AALIB AALIB_DIR=aalib @@ -52,9 +52,10 @@ else VORBIS_DIR= endif - -SUBDIRS=$(A52_DIR) $(AALIB_DIR) $(ALSA_DIR) $(AUDIOFILE_DIR) $(ESD_DIR) \ +#$A52_DIR +SUBDIRS=$(AALIB_DIR) $(ALSA_DIR) $(AUDIOFILE_DIR) $(ESD_DIR) \ $(LAME_DIR) $(MAD_DIR) \ $(SDL_DIR) $(VORBIS_DIR) -DIST_SUBDIRS=a52 aalib alsa audiofile esd lame mad sdl vorbis +#a52 +DIST_SUBDIRS=aalib alsa audiofile esd lame mad sdl vorbis diff --git a/gst/mpegaudioparse/Makefile.am b/gst/mpegaudioparse/Makefile.am index 9d670bd31e..4823c99647 100644 --- a/gst/mpegaudioparse/Makefile.am +++ b/gst/mpegaudioparse/Makefile.am @@ -3,7 +3,7 @@ filterdir = $(libdir)/gst filter_LTLIBRARIES = libgstmpegaudioparse.la libgstmp3types.la -libgstmpegaudioparse_la_SOURCES = gstmpegaudioparse.c gstmp3types.c +libgstmpegaudioparse_la_SOURCES = gstmpegaudioparse.c # FIXME is this useful? libgstmpegaudioparse_la_CFLAGS = -O3 $(FOMIT_FRAME_POINTER) -ffast-math -finline-functions $(GST_CFLAGS) diff --git a/gst/synaesthesia/Makefile.am b/gst/synaesthesia/Makefile.am index e9b41bcbb3..20e26b4612 100644 --- a/gst/synaesthesia/Makefile.am +++ b/gst/synaesthesia/Makefile.am @@ -3,6 +3,8 @@ filterdir = $(libdir)/gst filter_LTLIBRARIES = libgstsynaesthesia.la libgstsynaesthesia_la_SOURCES = core.c gstsynaesthesia.c +libgstsynaesthesia_la_CFLAGS = $(GST_CFLAGS) $(GTK_CFLAGS) +libgstsynaesthesia_la_LIBADD = $(GTK_LIBS) noinst_HEADERS = core.h gstsynaesthesia.h diff --git a/gst/synaesthesia/gstsynaesthesia.c b/gst/synaesthesia/gstsynaesthesia.c index 0027a6930d..1c2198dcef 100644 --- a/gst/synaesthesia/gstsynaesthesia.c +++ b/gst/synaesthesia/gstsynaesthesia.c @@ -17,12 +17,13 @@ * Boston, MA 02111-1307, USA. */ - #include "config.h" #include "gstsynaesthesia.h" #include "core.h" +#warning hi, i'm synaesthesia. i'm severely broken. somebody please fix me. + static gboolean gst_synaesthesia_start(GstElement *element); GstElementDetails gst_synaesthesia_details = { @@ -170,11 +171,11 @@ static void gst_synaesthesia_chain(GstPad *pad,GstBuffer *buf) { GDK_RGB_DITHER_NORMAL, syna->sp.output,syna->width, &syna->cmap);*/ - gdk_draw_gray_image(syna->image->window, +/* gdk_draw_gray_image(syna->image->window, syna->image->style->fg_gc[GTK_STATE_NORMAL], 0,0,syna->width,syna->height, GDK_RGB_DITHER_NORMAL, - syna->sp.output,syna->width); + syna->sp.output,syna->width); */ gst_trace_add_entry(NULL,0,buf,"synaesthesia: calculated syna"); @@ -209,7 +210,7 @@ gst_synaesthesia_get_property(GObject *object, guint prop_id, GValue *value, GPa g_return_if_fail(GST_IS_SYNAESTHESIA(object)); synaesthesia = GST_SYNAESTHESIA(object); - GST_DEBUG (0,"have synaesthesia get_property(%d), wanting %d\n",id,ARG_WIDGET); + GST_DEBUG (0,"have synaesthesia get_property(%d), wanting %d\n",prop_id,ARG_WIDGET); switch (prop_id) { case ARG_WIDTH: { @@ -222,11 +223,11 @@ gst_synaesthesia_get_property(GObject *object, guint prop_id, GValue *value, GPa GST_DEBUG (0,"returning height value %d\n",g_value_get_int (value)); break; } - case ARG_WIDGET: { +/* case ARG_WIDGET: { g_value_set_object (value, G_OBJECT(synaesthesia->image)); GST_DEBUG (0,"returning widget value %p\n",g_value_get_object (value)); break; - } + }*/ default: { G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); GST_DEBUG (0,"returning invalid type\n"); @@ -276,15 +277,15 @@ gst_synaesthesia_start(GstElement *element) coreInit(&syna->sp, syna->width, syna->height); setStarSize(&syna->sp, syna->starsize); - setupPalette(&syna->sp, syna->cmap.colors); +/* setupPalette(&syna->sp, syna->cmap.colors); */ gdk_rgb_init(); - syna->image = gtk_drawing_area_new(); +/* syna->image = gtk_drawing_area_new(); GST_DEBUG (0,"image is %p\n",syna->image); gtk_drawing_area_size(GTK_DRAWING_AREA(syna->image), syna->width, syna->height); - gtk_widget_show(syna->image); + gtk_widget_show(syna->image);*/ GST_DEBUG (0,"started synaesthesia\n"); return TRUE;