Speex compiles

Original commit message from CVS:
Speex compiles

3 files changed, 107 insertions, 87 deletions

diff --git a/ext/speex/gstspeex.c b/ext/speex/gstspeex.c
index 518e392c..7103f010 100644
--- a/ext/speex/gstspeex.c
+++ b/ext/speex/gstspeex.c
@@ -16,94 +16,31 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-
+#include <config.h>
 
 #include "gstspeexdec.h"
 #include "gstspeexenc.h"
 
-/* elementfactory information */
-extern GstElementDetails gst_speexdec_details;
-extern GstElementDetails gst_speexenc_details;
-
-GstPadTemplate *speexdec_src_template, *speexdec_sink_template; 
-GstPadTemplate *speexenc_src_template, *speexenc_sink_template;
-
-GST_CAPS_FACTORY (speex_caps_factory,
-  GST_CAPS_NEW (
-    "speex_speex",
-    "audio/x-speex",
-      "rate",       GST_PROPS_INT_RANGE (1000, 48000),
-      "channels",   GST_PROPS_INT (1)
-  )
-)
-
-GST_CAPS_FACTORY (raw_caps_factory,
-  GST_CAPS_NEW (
-    "speex_raw",
-    "audio/x-raw-int",
-      "endianness", GST_PROPS_INT (G_BYTE_ORDER),
-      "signed",     GST_PROPS_BOOLEAN (TRUE),
-      "width",      GST_PROPS_INT (16),
-      "depth",      GST_PROPS_INT (16),
-      "rate",       GST_PROPS_INT_RANGE (1000, 48000),
-      "channels",   GST_PROPS_INT (1)
-  )
-)
-
 static gboolean
-plugin_init (GModule *module, GstPlugin *plugin)
+plugin_init (GstPlugin *plugin)
 {
-  GstElementFactory *dec, *enc;
-  GstCaps *raw_caps, *speex_caps;
-
-  /* create an elementfactory for the speexdec element */
-  enc = gst_element_factory_new("speexenc",GST_TYPE_SPEEXENC,
-                                   &gst_speexenc_details);
-  g_return_val_if_fail(enc != NULL, FALSE);
+  if (!gst_element_register (plugin, "speexenc", GST_RANK_NONE, GST_TYPE_SPEEXENC))
+    return FALSE;
 
-  raw_caps = GST_CAPS_GET (raw_caps_factory);
-  speex_caps = GST_CAPS_GET (speex_caps_factory);
-
-  /* register sink pads */
-  speexenc_sink_template = gst_pad_template_new ("sink", GST_PAD_SINK, 
-		                              GST_PAD_ALWAYS, 
-					      raw_caps, NULL);
-  gst_element_factory_add_pad_template (enc, speexenc_sink_template);
-
-  /* register src pads */
-  speexenc_src_template = gst_pad_template_new ("src", GST_PAD_SRC, 
-		                             GST_PAD_ALWAYS, 
-					     speex_caps, NULL);
-  gst_element_factory_add_pad_template (enc, speexenc_src_template);
-
-  gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (enc));
-
-  /* create an elementfactory for the speexdec element */
-  dec = gst_element_factory_new("speexdec",GST_TYPE_SPEEXDEC,
-                                   &gst_speexdec_details);
-  g_return_val_if_fail(dec != NULL, FALSE);
-  gst_element_factory_set_rank (dec, GST_ELEMENT_RANK_PRIMARY);
- 
-  /* register sink pads */
-  speexdec_sink_template = gst_pad_template_new ("sink", GST_PAD_SINK, 
-		                              GST_PAD_ALWAYS, 
-					      speex_caps, NULL);
-  gst_element_factory_add_pad_template (dec, speexdec_sink_template);
-
-  /* register src pads */
-  speexdec_src_template = gst_pad_template_new ("src", GST_PAD_SRC, 
-		                             GST_PAD_ALWAYS, 
-					     raw_caps, NULL);
-  gst_element_factory_add_pad_template (dec, speexdec_src_template);
+  if (!gst_element_register (plugin, "speexdec", GST_RANK_PRIMARY, GST_TYPE_SPEEXDEC))
+    return FALSE;
   
-  gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (dec));
-
   return TRUE;
 }
 
-GstPluginDesc plugin_desc = {
+GST_PLUGIN_DEFINE (
   GST_VERSION_MAJOR,
   GST_VERSION_MINOR,
   "speex",
-  plugin_init
-};
+  "Speex plugin library",
+  plugin_init,
+  VERSION,
+  "LGPL",
+  GST_COPYRIGHT,
+  GST_PACKAGE,
+  GST_ORIGIN)
diff --git a/ext/speex/gstspeexdec.c b/ext/speex/gstspeexdec.c
index 7ef79df7..7fd5dc53 100644
--- a/ext/speex/gstspeexdec.c
+++ b/ext/speex/gstspeexdec.c
@@ -25,17 +25,14 @@
 
 #include "gstspeexdec.h"
 
-extern GstPadTemplate *speexdec_src_template, *speexdec_sink_template;
+static GstPadTemplate *speexdec_src_template, *speexdec_sink_template;
 
 /* elementfactory information */
 GstElementDetails gst_speexdec_details = {
   "speex audio decoder",
   "Codec/Audio/Decoder",
-  "LGPL",
   ".speex",
-  VERSION,
   "Wim Taymans <wim.taymans@chello.be>",
-  "(C) 2000",
 };
 
 /* SpeexDec signals and args */
@@ -49,6 +46,7 @@ enum {
   /* FILL ME */
 };
 
+static void                     gst_speexdec_base_init (gpointer g_class);
 static void			gst_speexdec_class_init	(GstSpeexDec *klass);
 static void			gst_speexdec_init		(GstSpeexDec *speexdec);
 
@@ -64,7 +62,8 @@ gst_speexdec_get_type(void) {
 
   if (!speexdec_type) {
     static const GTypeInfo speexdec_info = {
-      sizeof(GstSpeexDecClass),      NULL,
+      sizeof(GstSpeexDecClass),
+      gst_speexdec_base_init,
       NULL,
       (GClassInitFunc)gst_speexdec_class_init,
       NULL,
@@ -78,6 +77,49 @@ gst_speexdec_get_type(void) {
   return speexdec_type;
 }
 
+GST_CAPS_FACTORY (speex_caps_factory,
+  GST_CAPS_NEW (
+    "speex_speex",
+    "audio/x-speex",
+      "rate",       GST_PROPS_INT_RANGE (1000, 48000),
+      "channels",   GST_PROPS_INT (1)
+  )
+)
+
+GST_CAPS_FACTORY (raw_caps_factory,
+  GST_CAPS_NEW (
+    "speex_raw",
+    "audio/x-raw-int",
+      "endianness", GST_PROPS_INT (G_BYTE_ORDER),
+      "signed",     GST_PROPS_BOOLEAN (TRUE),
+      "width",      GST_PROPS_INT (16),
+      "depth",      GST_PROPS_INT (16),
+      "rate",       GST_PROPS_INT_RANGE (1000, 48000),
+      "channels",   GST_PROPS_INT (1)
+  )
+)
+
+static void
+gst_speexdec_base_init (gpointer g_class)
+{
+  GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
+  GstCaps *raw_caps, *speex_caps;
+
+  raw_caps = GST_CAPS_GET (raw_caps_factory);
+  speex_caps = GST_CAPS_GET (speex_caps_factory);
+
+  speexdec_sink_template = gst_pad_template_new ("sink", GST_PAD_SINK, 
+		                              GST_PAD_ALWAYS, 
+					      speex_caps, NULL);
+  speexdec_src_template = gst_pad_template_new ("src", GST_PAD_SRC, 
+		                             GST_PAD_ALWAYS, 
+					     raw_caps, NULL);
+  gst_element_class_add_pad_template (element_class, speexdec_sink_template);
+  gst_element_class_add_pad_template (element_class, speexdec_src_template);
+
+  gst_element_class_set_details (element_class, &gst_speexdec_details);
+}
+
 static void
 gst_speexdec_class_init (GstSpeexDec *klass)
 {
diff --git a/ext/speex/gstspeexenc.c b/ext/speex/gstspeexenc.c
index 47412bb6..c6be4aa7 100644
--- a/ext/speex/gstspeexenc.c
+++ b/ext/speex/gstspeexenc.c
@@ -25,17 +25,14 @@
 
 #include "gstspeexenc.h"
 
-extern GstPadTemplate *speexenc_src_template, *speexenc_sink_template;
+static GstPadTemplate *speexenc_src_template, *speexenc_sink_template;
 
 /* elementfactory information */
 GstElementDetails gst_speexenc_details = {
   "speex audio encoder",
   "Codec/Audio/Encoder",
-  "LGPL",
   ".speex",
-  VERSION,
   "Wim Taymans <wim.taymans@chello.be>",
-  "(C) 2000",
 };
 
 /* SpeexEnc signals and args */
@@ -50,6 +47,7 @@ enum {
   /* FILL ME */
 };
 
+static void                     gst_speexenc_base_init (gpointer g_class);
 static void			gst_speexenc_class_init	(GstSpeexEnc *klass);
 static void			gst_speexenc_init		(GstSpeexEnc *speexenc);
 
@@ -67,7 +65,7 @@ gst_speexenc_get_type (void)
   if (!speexenc_type) {
     static const GTypeInfo speexenc_info = {
       sizeof (GstSpeexEncClass),
-      NULL,
+      gst_speexenc_base_init,
       NULL,
       (GClassInitFunc) gst_speexenc_class_init,
       NULL,
@@ -81,6 +79,49 @@ gst_speexenc_get_type (void)
   return speexenc_type;
 }
 
+GST_CAPS_FACTORY (speex_caps_factory,
+  GST_CAPS_NEW (
+    "speex_speex",
+    "audio/x-speex",
+      "rate",       GST_PROPS_INT_RANGE (1000, 48000),
+      "channels",   GST_PROPS_INT (1)
+  )
+)
+
+GST_CAPS_FACTORY (raw_caps_factory,
+  GST_CAPS_NEW (
+    "speex_raw",
+    "audio/x-raw-int",
+      "endianness", GST_PROPS_INT (G_BYTE_ORDER),
+      "signed",     GST_PROPS_BOOLEAN (TRUE),
+      "width",      GST_PROPS_INT (16),
+      "depth",      GST_PROPS_INT (16),
+      "rate",       GST_PROPS_INT_RANGE (1000, 48000),
+      "channels",   GST_PROPS_INT (1)
+  )
+)
+
+static void
+gst_speexenc_base_init (gpointer g_class)
+{
+  GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
+  GstCaps *raw_caps, *speex_caps;
+  
+  raw_caps = GST_CAPS_GET (raw_caps_factory);
+  speex_caps = GST_CAPS_GET (speex_caps_factory);
+
+  speexenc_sink_template = gst_pad_template_new ("sink", GST_PAD_SINK, 
+		                              GST_PAD_ALWAYS, 
+					      raw_caps, NULL);
+  speexenc_src_template = gst_pad_template_new ("src", GST_PAD_SRC, 
+		                             GST_PAD_ALWAYS, 
+					     speex_caps, NULL);
+  gst_element_class_add_pad_template (element_class, speexenc_sink_template);
+  gst_element_class_add_pad_template (element_class, speexenc_src_template);
+
+  gst_element_class_set_details (element_class, &gst_speexenc_details);
+}
+
 static void
 gst_speexenc_class_init (GstSpeexEnc *klass)
 {