From 6863dd92408eb5bd758e6c297324e6b2dc81042b Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Sat, 20 Apr 2002 21:42:51 +0000 Subject: 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 --- ext/arts/gst_arts.c | 6 +++--- ext/artsd/gstartsdsink.c | 2 +- ext/audiofile/gstafsink.c | 4 ++-- ext/audiofile/gstafsrc.c | 4 ++-- ext/gsm/gstgsmdec.c | 2 +- ext/gsm/gstgsmenc.c | 2 +- ext/hermes/gstcolorspace.c | 4 ++-- ext/jack/gstjack.c | 3 ++- ext/ladspa/gstladspa.c | 16 +++++++--------- ext/ladspa/gstladspa.h | 2 +- 10 files changed, 22 insertions(+), 23 deletions(-) (limited to 'ext') diff --git a/ext/arts/gst_arts.c b/ext/arts/gst_arts.c index f3b45b41..f85214a0 100644 --- a/ext/arts/gst_arts.c +++ b/ext/arts/gst_arts.c @@ -29,10 +29,10 @@ static GstElementDetails gst_arts_details = { "aRts plugin", "Filter/Audio", - "aRts plugin", + "aRts wrapper filter", VERSION, - "Erik Walthinsen ", + "Erik Walthinsen ", "(C) 2000", }; diff --git a/ext/artsd/gstartsdsink.c b/ext/artsd/gstartsdsink.c index 1933c312..81a06a30 100644 --- a/ext/artsd/gstartsdsink.c +++ b/ext/artsd/gstartsdsink.c @@ -25,7 +25,7 @@ /* elementfactory information */ static GstElementDetails artsdsink_details = { "aRtsd audio sink", - "Sink/Artsdsink", + "Sink/Audio", "Plays audio to an aRts server", VERSION, "Richard Boulton ", diff --git a/ext/audiofile/gstafsink.c b/ext/audiofile/gstafsink.c index 5a307377..77e1637d 100644 --- a/ext/audiofile/gstafsink.c +++ b/ext/audiofile/gstafsink.c @@ -27,8 +27,8 @@ static GstElementDetails afsink_details = { "Audiofile Sink", - "Sink", - "Audiofile sink for audio/raw", + "Sink/Audio", + "Write audio streams to disk using libaudiofile", VERSION, "Thomas ", "(C) 2001" diff --git a/ext/audiofile/gstafsrc.c b/ext/audiofile/gstafsrc.c index 92483179..751b3cec 100644 --- a/ext/audiofile/gstafsrc.c +++ b/ext/audiofile/gstafsrc.c @@ -28,8 +28,8 @@ static GstElementDetails afsrc_details = { "Audiofile Src", - "Src", - "Audiofile src for audio/raw", + "Source/Audio", + "Read audio files from disk using libaudiofile", VERSION, "Thomas ", "(C) 2001" diff --git a/ext/gsm/gstgsmdec.c b/ext/gsm/gstgsmdec.c index 0e2f4168..35207618 100644 --- a/ext/gsm/gstgsmdec.c +++ b/ext/gsm/gstgsmdec.c @@ -27,7 +27,7 @@ extern GstPadTemplate *gsmdec_src_template, *gsmdec_sink_template; /* elementfactory information */ GstElementDetails gst_gsmdec_details = { "gsm audio decoder", - "Filter/Decoder/Audio", + "Codec/Audio/Decoder", ".gsm", VERSION, "Wim Taymans ", diff --git a/ext/gsm/gstgsmenc.c b/ext/gsm/gstgsmenc.c index e9a61cde..633863c1 100644 --- a/ext/gsm/gstgsmenc.c +++ b/ext/gsm/gstgsmenc.c @@ -27,7 +27,7 @@ extern GstPadTemplate *gsmenc_src_template, *gsmenc_sink_template; /* elementfactory information */ GstElementDetails gst_gsmenc_details = { "gsm audio encoder", - "Filter/Encoder/Audio", + "Codec/Audio/Encoder", ".gsm", VERSION, "Wim Taymans ", diff --git a/ext/hermes/gstcolorspace.c b/ext/hermes/gstcolorspace.c index 5e081a79..9cdaf3bb 100644 --- a/ext/hermes/gstcolorspace.c +++ b/ext/hermes/gstcolorspace.c @@ -25,8 +25,8 @@ static GstElementDetails colorspace_details = { "Colorspace converter", - "Filter/Effect", - "Converts video from one colorspace to another", + "Filter/Video", + "Converts video from one colorspace to another using libhermes", VERSION, "Wim Taymans ", "(C) 2001", diff --git a/ext/jack/gstjack.c b/ext/jack/gstjack.c index fc297750..87ce638c 100644 --- a/ext/jack/gstjack.c +++ b/ext/jack/gstjack.c @@ -37,7 +37,7 @@ static GstElementDetails gst_jack_bin_details = { "Jack Bin", - "Bin/Audio", + "Generic/Bin", "Jack processing bin: see README for more info", VERSION, "Andy Wingo ", @@ -451,6 +451,7 @@ plugin_init (GModule *module, GstPlugin *plugin) factory = gst_element_factory_new ("jackbin", GST_TYPE_JACK_BIN, &gst_jack_bin_details); g_return_val_if_fail (factory != NULL, FALSE); + gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory)); factory = gst_element_factory_new ("jacksrc", GST_TYPE_JACK_SRC, &gst_jack_src_details); g_return_val_if_fail (factory != NULL, FALSE); diff --git a/ext/ladspa/gstladspa.c b/ext/ladspa/gstladspa.c index 081f03d8..4ad7d3fd 100644 --- a/ext/ladspa/gstladspa.c +++ b/ext/ladspa/gstladspa.c @@ -398,6 +398,7 @@ gst_ladspa_init (GstLADSPA *ladspa) ladspa->newcaps = FALSE; ladspa->activated = FALSE; ladspa->bufpool = NULL; + ladspa->inplace_broken = LADSPA_IS_INPLACE_BROKEN(ladspa->descriptor->Properties); if (sinkcount==0 && srccount == 1) { /* get mode (no sink pads) */ @@ -719,7 +720,6 @@ gst_ladspa_loop(GstElement *element) GstBuffer **buffers_in, **buffers_out; GstBufferPool *bufpool; GstByteStream **bytestreams; - gboolean inplace_broken; GstLADSPA *ladspa = (GstLADSPA *)element; GstLADSPAClass *oclass = (GstLADSPAClass*)(G_OBJECT_GET_CLASS (ladspa)); @@ -799,7 +799,7 @@ gst_ladspa_loop(GstElement *element) /* we now have a full set of buffers_in. * now share or create the buffers_out */ for (i=0 ; iinplace_broken){ /* we can share buffers */ buffers_out[i] = buffers_in[i]; data_out[i] = data_in[i]; @@ -845,7 +845,7 @@ gst_ladspa_loop(GstElement *element) buffers_out[i] = NULL; } for (i=0 ; i numsrcpads || inplace_broken){ + if (i > numsrcpads || ladspa->inplace_broken){ /* we have some buffers to unref */ gst_buffer_unref(buffers_in[i]); } @@ -873,11 +873,10 @@ static void gst_ladspa_chain (GstPad *pad, GstBuffer *buf) { LADSPA_Descriptor *desc; - LADSPA_Data *data_in, **data_out; - GstBuffer **buffers_out; + LADSPA_Data *data_in, **data_out = NULL; + GstBuffer **buffers_out = NULL; unsigned long num_samples; - gboolean inplace_broken; guint num_to_process, num_processed, i, numsrcpads; GstLADSPA *ladspa; @@ -909,13 +908,12 @@ gst_ladspa_chain (GstPad *pad, GstBuffer *buf) desc = ladspa->descriptor; - inplace_broken = LADSPA_IS_INPLACE_BROKEN(desc->Properties); if (numsrcpads > 0){ guint num_created_buffers = 0; buffers_out = g_new(GstBuffer*, numsrcpads); data_out = g_new(LADSPA_Data*, numsrcpads); - if (inplace_broken){ + if (ladspa->inplace_broken){ num_created_buffers = numsrcpads; } else { @@ -1077,7 +1075,7 @@ ladspa_describe_plugin(const char *pcFullFilename, /* construct the element details struct */ details = g_new0(GstElementDetails,1); details->longname = g_strdup(desc->Name); - details->klass = "Filter/LADSPA"; + details->klass = "Filter/Audio/LADSPA"; details->description = details->longname; details->version = g_strdup_printf("%ld",desc->UniqueID); details->author = g_strdup(desc->Maker); diff --git a/ext/ladspa/gstladspa.h b/ext/ladspa/gstladspa.h index 18357585..c7021a62 100644 --- a/ext/ladspa/gstladspa.h +++ b/ext/ladspa/gstladspa.h @@ -66,7 +66,7 @@ struct _GstLADSPA { gint samplerate, buffersize, numbuffers; gint64 timestamp; - + gboolean inplace_broken; }; struct _GstLADSPAClass { -- cgit v1.2.1