summaryrefslogtreecommitdiffstats
path: root/ext
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2002-04-20 21:42:51 +0000
committerAndy Wingo <wingo@pobox.com>2002-04-20 21:42:51 +0000
commitcca77e215b01ddf27c13eff5c105883c94e95dc2 (patch)
tree5a3f86ec87b4e63871e6af52abb27ce2d204d8f1 /ext
parentd4458d89c9dd748f39219a2b0e0df61dfc0cf4eb (diff)
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
Diffstat (limited to 'ext')
-rw-r--r--ext/esd/esdmon.c2
-rw-r--r--ext/esd/esdsink.c2
-rw-r--r--ext/flac/gstflacdec.c2
-rw-r--r--ext/flac/gstflacenc.c2
-rw-r--r--ext/jpeg/gstjpegdec.c2
-rw-r--r--ext/jpeg/gstjpegenc.c2
-rw-r--r--ext/ladspa/gstladspa.c16
-rw-r--r--ext/ladspa/gstladspa.h2
8 files changed, 14 insertions, 16 deletions
diff --git a/ext/esd/esdmon.c b/ext/esd/esdmon.c
index 3398ad93..51441c34 100644
--- a/ext/esd/esdmon.c
+++ b/ext/esd/esdmon.c
@@ -70,7 +70,7 @@ GType gst_esdmon_get_type(void);
/* elementfactory information */
static GstElementDetails esdmon_details = {
"Esound audio monitor",
- "Src/Esdmon",
+ "Source/Audio",
"Monitors audio from an esound server",
VERSION,
"Richard Boulton <richard-gst@tartarus.org>",
diff --git a/ext/esd/esdsink.c b/ext/esd/esdsink.c
index ab92d418..0ac118c9 100644
--- a/ext/esd/esdsink.c
+++ b/ext/esd/esdsink.c
@@ -26,7 +26,7 @@
/* elementfactory information */
static GstElementDetails esdsink_details = {
"Esound audio sink",
- "Sink/Esdsink",
+ "Sink/Audio",
"Plays audio to an esound server",
VERSION,
"Richard Boulton <richard-gst@tartarus.org>",
diff --git a/ext/flac/gstflacdec.c b/ext/flac/gstflacdec.c
index 125f97c5..a6a07e40 100644
--- a/ext/flac/gstflacdec.c
+++ b/ext/flac/gstflacdec.c
@@ -29,7 +29,7 @@ extern GstPadTemplate *dec_src_template, *dec_sink_template;
/* elementfactory information */
GstElementDetails flacdec_details = {
"FLAC decoder",
- "Filter/Audio/Decoder",
+ "Codec/Audio/Decoder",
"Decodes FLAC lossless audio streams",
VERSION,
"Wim Taymans <wim.taymans@chello.be>",
diff --git a/ext/flac/gstflacenc.c b/ext/flac/gstflacenc.c
index ac8759b0..0119f95a 100644
--- a/ext/flac/gstflacenc.c
+++ b/ext/flac/gstflacenc.c
@@ -28,7 +28,7 @@ extern GstPadTemplate *enc_src_template, *enc_sink_template;
/* elementfactory information */
GstElementDetails flacenc_details = {
"FLAC encoder",
- "Filter/Audio/Encoder",
+ "Codec/Audio/Encoder",
"Encodes audio with the FLAC lossless audio encoder",
VERSION,
"Wim Taymans <wim.taymans@chello.be>",
diff --git a/ext/jpeg/gstjpegdec.c b/ext/jpeg/gstjpegdec.c
index 93c1cd3b..8be4b209 100644
--- a/ext/jpeg/gstjpegdec.c
+++ b/ext/jpeg/gstjpegdec.c
@@ -28,7 +28,7 @@ extern GstPadTemplate *jpegdec_src_template, *jpegdec_sink_template;
/* elementfactory information */
GstElementDetails gst_jpegdec_details = {
"jpeg image decoder",
- "Filter/Decoder/Image",
+ "Codec/Image/Decoder",
".jpeg",
VERSION,
"Wim Taymans <wim.taymans@tvd.be>",
diff --git a/ext/jpeg/gstjpegenc.c b/ext/jpeg/gstjpegenc.c
index 135ac455..4734f9f0 100644
--- a/ext/jpeg/gstjpegenc.c
+++ b/ext/jpeg/gstjpegenc.c
@@ -25,7 +25,7 @@
/* elementfactory information */
GstElementDetails gst_jpegenc_details = {
"jpeg image encoder",
- "Filter/Encoder/Image",
+ "Codec/Image/Encoder",
".jpeg",
VERSION,
"Wim Taymans <wim.taymans@tvd.be>",
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 ; i<numsrcpads ; i++){
- if (i <= numsinkpads && !inplace_broken){
+ if (i <= numsinkpads && !ladspa->inplace_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<numsinkpads ; i++) {
- if (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 {