try to fix segfault

Original commit message from CVS:
try to fix segfault

1 files changed, 85 insertions, 119 deletions

diff --git a/ext/arts/gst_arts.c b/ext/arts/gst_arts.c
index a6c9621d..839ce68e 100644
--- a/ext/arts/gst_arts.c
+++ b/ext/arts/gst_arts.c
@@ -60,124 +60,90 @@ static GstStaticPadTemplate sink_temp = GST_STATIC_PAD_TEMPLATE ("sink",
         "width = (int) 16, "
         "signed = (boolean) true, "
         "channels = (int) 2, "
-        "rate = (int) 44100, " "endianness = (int) byte_order")
+        "rate = (int) 44100, " "endianness = (int) " G_STRINGIFY (G_BYTE_ORDER)
     );
-
-static GstStaticPadTemplate src_temp = GST_STATIC_PAD_TEMPLATE ("src",
-    GST_PAD_SRC,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("audio/x-raw-int, "
-        "depth = (int) 16, "
-        "width = (int) 16, "
-        "signed = (boolean) true, "
-        "channels = (int) 2, "
-        "rate = (int) 44100, " "endianness = (int) byte_order")
-    );
-
-enum
-{
-  ARG_0,
-  ARG_LAST
-};
-
-static void gst_arts_base_init (gpointer g_class);
-static void gst_arts_class_init (GstARTSClass * klass);
-static void gst_arts_init (GstARTS * arts);
-
-static void gst_arts_loop (GstElement * element);
-
-
-static GstElementClass *parent_class = NULL;
-
+    static GstStaticPadTemplate src_temp = GST_STATIC_PAD_TEMPLATE ("src",
+        GST_PAD_SRC,
+        GST_PAD_ALWAYS,
+        GST_STATIC_CAPS ("audio/x-raw-int, "
+            "depth = (int) 16, "
+            "width = (int) 16, "
+            "signed = (boolean) true, "
+            "channels = (int) 2, "
+            "rate = (int) 44100, " "endianness = (int) "
+            G_STRINGIFY (G_BYTE_ORDER)
+        ); enum
+        {
+          ARG_0,
+          ARG_LAST
+        };
+        static void gst_arts_base_init (gpointer g_class);
+        static void gst_arts_class_init (GstARTSClass * klass);
+        static void gst_arts_init (GstARTS * arts);
+        static void gst_arts_loop (GstElement * element);
+        static GstElementClass * parent_class = NULL;
 /*static guint gst_arts_signals[LAST_SIGNAL] = { 0 }; */
-
-GType
-gst_arts_get_type (void)
-{
-  static GType gst_arts_type = 0;
-
-  if (!gst_arts_type) {
-    static const GTypeInfo gst_arts_info = {
-      sizeof (GstARTSClass),
-      gst_arts_base_init,
-      NULL,
-      (GClassInitFunc) gst_arts_class_init,
-      NULL,
-      NULL,
-      sizeof (GstARTS),
-      0,
-      (GInstanceInitFunc) gst_arts_init,
-    };
-
-    gst_arts_type =
-        g_type_register_static (GST_TYPE_ELEMENT, "GstArts", &gst_arts_info, 0);
-  }
-  return gst_arts_type;
-}
-
-static void
-gst_arts_base_init (gpointer g_class)
-{
-  GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
-
-  gst_element_class_add_pad_template (element_class,
-      gst_static_pad_template_get (&sink_temp));
-  gst_element_class_add_pad_template (element_class,
-      gst_static_pad_template_get (&src_temp));
-  gst_element_class_set_details (element_class, &gst_arts_details);
-}
-
-static void
-gst_arts_class_init (GstARTSClass * klass)
-{
-  GObjectClass *gobject_class;
-  GstElementClass *gstelement_class;
-
-  parent_class = g_type_class_ref (GST_TYPE_ELEMENT);
-
-  gobject_class = (GObjectClass *) klass;
-  gstelement_class = (GstElementClass *) klass;
-}
-
-static void
-gst_arts_init (GstARTS * arts)
-{
-  arts->sinkpad =
-      gst_pad_new_from_template (gst_element_get_pad_template (GST_ELEMENT
-          (arts), "sink"), "sink");
-  gst_element_add_pad (GST_ELEMENT (arts), arts->sinkpad);
-
-  arts->srcpad =
-      gst_pad_new_from_template (gst_element_get_pad_template (GST_ELEMENT
-          (arts), "src"), "src");
-  gst_element_add_pad (GST_ELEMENT (arts), arts->srcpad);
-
-  gst_element_set_loop_function (GST_ELEMENT (arts), gst_arts_loop);
-
-  arts->wrapper = gst_arts_wrapper_new (arts->sinkpad, arts->srcpad);
-}
-
-static void
-gst_arts_loop (GstElement * element)
-{
-  GstARTS *arts = (GstARTS *) element;
-
-  g_return_if_fail (arts != NULL);
-
-  gst_arts_wrapper_do (arts->wrapper);
-}
-
-static gboolean
-plugin_init (GstPlugin * plugin)
-{
-  if (!gst_element_register (plugin, "gstarts", GST_RANK_NONE, GST_TYPE_ARTS))
-    return FALSE;
-
-  return TRUE;
-}
-
-GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
-    GST_VERSION_MINOR,
-    "gst_arts",
-    "arTs filter wrapper",
-    plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN)
+        GType gst_arts_get_type (void)
+        {
+          static GType gst_arts_type = 0; if (!gst_arts_type) {
+            static const GTypeInfo gst_arts_info = {
+          sizeof (GstARTSClass),
+              gst_arts_base_init,
+              NULL,
+              (GClassInitFunc) gst_arts_class_init,
+              NULL,
+              NULL,
+              sizeof (GstARTS),
+              0,
+              (GInstanceInitFunc) gst_arts_init,};
+            gst_arts_type =
+            g_type_register_static (GST_TYPE_ELEMENT, "GstArts",
+                &gst_arts_info, 0);}
+        return gst_arts_type;}
+
+        static void gst_arts_base_init (gpointer g_class)
+        {
+        GstElementClass * element_class = GST_ELEMENT_CLASS (g_class);
+          gst_element_class_add_pad_template (element_class,
+              gst_static_pad_template_get (&sink_temp));
+          gst_element_class_add_pad_template (element_class,
+              gst_static_pad_template_get (&src_temp));
+          gst_element_class_set_details (element_class, &gst_arts_details);}
+
+        static void gst_arts_class_init (GstARTSClass * klass)
+        {
+        GObjectClass * gobject_class;
+          GstElementClass * gstelement_class;
+          parent_class = g_type_class_ref (GST_TYPE_ELEMENT);
+          gobject_class = (GObjectClass *) klass;
+          gstelement_class = (GstElementClass *) klass;}
+
+        static void gst_arts_init (GstARTS * arts)
+        {
+        arts->sinkpad =
+          gst_pad_new_from_template (gst_element_get_pad_template (GST_ELEMENT
+                  (arts), "sink"), "sink");
+          gst_element_add_pad (GST_ELEMENT (arts), arts->sinkpad);
+          arts->srcpad =
+          gst_pad_new_from_template (gst_element_get_pad_template (GST_ELEMENT
+                  (arts), "src"), "src");
+          gst_element_add_pad (GST_ELEMENT (arts), arts->srcpad);
+          gst_element_set_loop_function (GST_ELEMENT (arts), gst_arts_loop);
+          arts->wrapper = gst_arts_wrapper_new (arts->sinkpad, arts->srcpad);}
+
+        static void gst_arts_loop (GstElement * element)
+        {
+        GstARTS * arts = (GstARTS *) element;
+          g_return_if_fail (arts != NULL); gst_arts_wrapper_do (arts->wrapper);}
+
+        static gboolean plugin_init (GstPlugin * plugin)
+        {
+          if (!gst_element_register (plugin, "gstarts", GST_RANK_NONE,
+                  GST_TYPE_ARTS))
+        return FALSE; return TRUE;}
+
+        GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
+            GST_VERSION_MINOR,
+            "gst_arts",
+            "arTs filter wrapper",
+            plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN)