From d11dbb0338c7c55bd6b4e5d0d8094565cabaf212 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Sat, 20 Apr 2002 21:42:51 +0000 Subject: [PATCH] a hack to work around intltool's brokenness a current check for mpeg2dec details->klass reorganizations an element br... Original commit message from CVS: * a hack to work around intltool's brokenness * a current check for mpeg2dec * details->klass reorganizations * an element browser that uses details->klass * separated cdxa parse out from the avi directory --- configure.ac | 3 ++- ext/alsa/gstalsa.c | 8 ++++---- ext/cdparanoia/gstcdparanoia.c | 2 +- ext/gnomevfs/gstgnomevfssink.c | 4 ++-- ext/vorbis/vorbisdec.c | 2 +- ext/vorbis/vorbisenc.c | 2 +- gst/adder/gstadder.c | 2 +- gst/audioscale/gstaudioscale.c | 4 ++-- gst/videoscale/gstvideoscale.c | 2 +- gst/volume/gstvolume.c | 2 +- m4/mpeg2dec.m4 | 4 ++-- 11 files changed, 18 insertions(+), 17 deletions(-) diff --git a/configure.ac b/configure.ac index 3ebe17d39e..99d8e14a57 100644 --- a/configure.ac +++ b/configure.ac @@ -166,7 +166,7 @@ GST_PLUGIN_LDFLAGS='-module -avoid-version' AC_SUBST(GST_PLUGIN_LDFLAGS) GST_PLUGINS_ALL="\ - ac3parse adder audioscale auparse avi chart\ + ac3parse adder audioscale auparse avi cdxaparse chart\ cutter deinterlace flx goom intfloat law level\ median mpeg1enc mpeg1sys mpeg1videoparse mpeg2enc mpeg2sub\ mpegaudio mpegaudioparse mpegstream mpegtypes modplug\ @@ -744,6 +744,7 @@ gst/adder/Makefile gst/audioscale/Makefile gst/auparse/Makefile gst/avi/Makefile +gst/cdxaparse/Makefile gst/chart/Makefile gst/cutter/Makefile gst/deinterlace/Makefile diff --git a/ext/alsa/gstalsa.c b/ext/alsa/gstalsa.c index 6b4e25cafa..3aa8169c57 100644 --- a/ext/alsa/gstalsa.c +++ b/ext/alsa/gstalsa.c @@ -24,7 +24,7 @@ static GstElementDetails gst_alsa_sink_details = { "Alsa Sink", "Sink/Audio", - "Output to a sound card via ALSA: see plugins/alsa/README for more info", + "Output to a sound card via ALSA", VERSION, "Thomas Nyberg , " "Andy Wingo ", @@ -34,11 +34,11 @@ static GstElementDetails gst_alsa_sink_details = { static GstElementDetails gst_alsa_src_details = { "Alsa Src", "Source/Audio", - "Read from a sound card via ALSA: see plugins/alsa/README for more info", + "Read from a sound card via ALSA", VERSION, "Thomas Nyberg , " - "Andy Wingo " - "(C) 2001", + "Andy Wingo ", + "(C) 2001" }; static GstElement *parent_class = NULL; diff --git a/ext/cdparanoia/gstcdparanoia.c b/ext/cdparanoia/gstcdparanoia.c index 872850126c..f50c14a539 100644 --- a/ext/cdparanoia/gstcdparanoia.c +++ b/ext/cdparanoia/gstcdparanoia.c @@ -37,7 +37,7 @@ static GstElementDetails cdparanoia_details = { "CD Audio (cdda) Source, Paranoia IV", - "Source/File/CDDA", + "Source/File", "Read audio from CD in paranoid mode", VERSION, "Erik Walthinsen ", diff --git a/ext/gnomevfs/gstgnomevfssink.c b/ext/gnomevfs/gstgnomevfssink.c index cbb964ed07..acb380fa5a 100644 --- a/ext/gnomevfs/gstgnomevfssink.c +++ b/ext/gnomevfs/gstgnomevfssink.c @@ -75,8 +75,8 @@ GType gst_gnomevfssink_get_type(void); GstElementDetails gst_gnomevfssink_details = { "GnomeVFS Sink", - "Sink", - "GnomeVFS hole for data", + "Sink/File", + "Write stream to a GnomeVFS URI", VERSION, "Bastien Nocera ", "(C) 2001" diff --git a/ext/vorbis/vorbisdec.c b/ext/vorbis/vorbisdec.c index 766fa1b09a..193816c5f8 100644 --- a/ext/vorbis/vorbisdec.c +++ b/ext/vorbis/vorbisdec.c @@ -29,7 +29,7 @@ extern GstPadTemplate *dec_src_template, *dec_sink_template; GstElementDetails vorbisdec_details = { "Ogg Vorbis decoder", - "Filter/Audio/Decoder", + "Codec/Audio/Decoder", "Decodes OGG Vorbis audio", VERSION, "Monty , " diff --git a/ext/vorbis/vorbisenc.c b/ext/vorbis/vorbisenc.c index 7f140ac641..ec44e5be3a 100644 --- a/ext/vorbis/vorbisenc.c +++ b/ext/vorbis/vorbisenc.c @@ -32,7 +32,7 @@ extern GstPadTemplate *enc_src_template, *enc_sink_template; /* elementfactory information */ GstElementDetails vorbisenc_details = { "Ogg Vorbis encoder", - "Filter/Audio/Encoder", + "Codec/Audio/Encoder", "Encodes audio in OGG Vorbis format", VERSION, "Monty , " diff --git a/gst/adder/gstadder.c b/gst/adder/gstadder.c index 7ef883daf0..4081db907b 100644 --- a/gst/adder/gstadder.c +++ b/gst/adder/gstadder.c @@ -29,7 +29,7 @@ GstElementDetails adder_details = { "Adder", - "Filter/Effect", + "Filter/Audio", "2-to-1 audio adder/mixer", VERSION, "Thomas ", diff --git a/gst/audioscale/gstaudioscale.c b/gst/audioscale/gstaudioscale.c index 8774b6cb6e..a9dcfa9689 100644 --- a/gst/audioscale/gstaudioscale.c +++ b/gst/audioscale/gstaudioscale.c @@ -29,8 +29,8 @@ /* elementfactory information */ static GstElementDetails audioscale_details = { "Audio scaler", - "Filter/Audio/Scaler", - "Resizes audio", + "Filter/Audio", + "Audio resampler", VERSION, "Wim Taymans ", "(C) 2000", diff --git a/gst/videoscale/gstvideoscale.c b/gst/videoscale/gstvideoscale.c index a65a3a2ff3..8850ae9afb 100644 --- a/gst/videoscale/gstvideoscale.c +++ b/gst/videoscale/gstvideoscale.c @@ -26,7 +26,7 @@ /* elementfactory information */ static GstElementDetails videoscale_details = { "Video scaler", - "Filter/Video/Scaler", + "Filter/Video", "Resizes video", VERSION, "Wim Taymans ", diff --git a/gst/volume/gstvolume.c b/gst/volume/gstvolume.c index cc59c62dda..79fac22eb8 100644 --- a/gst/volume/gstvolume.c +++ b/gst/volume/gstvolume.c @@ -27,7 +27,7 @@ static GstElementDetails volume_details = { "Volume", - "Filter/Effect", + "Filter/Audio/Effect", "Set volume on audio/raw streams", VERSION, "Andy Wingo ", diff --git a/m4/mpeg2dec.m4 b/m4/mpeg2dec.m4 index 5b72fefd16..47422cd9c1 100644 --- a/m4/mpeg2dec.m4 +++ b/m4/mpeg2dec.m4 @@ -57,12 +57,12 @@ AC_ARG_WITH(mpeg2dec-prefix, if test x$mpeg2dec_config_prefix = x ; then MPEG2DEC_CHECK_LIBHEADER(MPEG2DEC, mpeg2, mpeg2_init, mpeg2dec/mpeg2.h, - MPEG2DEC_LIBS="-lmpeg2 -lcpuaccel") + MPEG2DEC_LIBS="-lmpeg2 -lcpuaccel",, -lcpuaccel) else MPEG2DEC_CHECK_LIBHEADER(MPEG2DEC, mpeg2, mpeg2_init, mpeg2dec/mpeg2.h, [ MPEG2DEC_LIBS="-lmpeg2 -lcpuaccel -L$mpeg2dec_config_prefix/lib" MPEG2DEC_CFLAGS="-I$mpeg2dec_config_prefix/include" - ], , -L$mpeg2dec_config_prefix/lib, -I$mpeg2dec_config_prefix/include) + ], , -L$mpeg2dec_config_prefix/lib -lcpuaccel, -I$mpeg2dec_config_prefix/include) fi if test "x$HAVE_MPEG2DEC" = "xyes"; then