From 8ba4b701181a7d0714d4cabbffc2f83679927a52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Thu, 9 Sep 2010 10:57:41 +0200
Subject: [PATCH] Revert "Revert "Use init functions for Orc code""

This reverts commit 93aa13639d74449dc68296427e5dbcfe8aca5f51.

Everything should work now after regenerating the disted source files.
---
 gst/adder/gstadder.c                    | 3 +--
 gst/adder/gstadderorc.orc               | 2 ++
 gst/audioconvert/gstaudioconvertorc.orc | 2 ++
 gst/audioconvert/plugin.c               | 3 +++
 gst/videoscale/gstvideoscale.c          | 3 +++
 gst/videoscale/gstvideoscaleorc.orc     | 2 ++
 gst/videotestsrc/gstvideotestsrc.c      | 3 +++
 gst/videotestsrc/gstvideotestsrcorc.orc | 2 ++
 gst/volume/gstvolume.c                  | 2 ++
 gst/volume/gstvolumeorc.orc             | 2 ++
 10 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/gst/adder/gstadder.c b/gst/adder/gstadder.c
index 07a1f34bac..f8a30a9da4 100644
--- a/gst/adder/gstadder.c
+++ b/gst/adder/gstadder.c
@@ -1291,8 +1291,7 @@ gst_adder_change_state (GstElement * element, GstStateChange transition)
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
-  GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "adder", 0,
-      "audio channel mixing element");
+  gst_adder_orc_init ();
 
   if (!gst_element_register (plugin, "adder", GST_RANK_NONE, GST_TYPE_ADDER)) {
     return FALSE;
diff --git a/gst/adder/gstadderorc.orc b/gst/adder/gstadderorc.orc
index e37f4a915f..f8c3caf03b 100644
--- a/gst/adder/gstadderorc.orc
+++ b/gst/adder/gstadderorc.orc
@@ -1,4 +1,6 @@
 
+.init gst_adder_orc_init
+
 .function add_int32
 .dest 4 d1 gint32
 .source 4 s1 gint32
diff --git a/gst/audioconvert/gstaudioconvertorc.orc b/gst/audioconvert/gstaudioconvertorc.orc
index aad07e9faa..1bed60516b 100644
--- a/gst/audioconvert/gstaudioconvertorc.orc
+++ b/gst/audioconvert/gstaudioconvertorc.orc
@@ -1,4 +1,6 @@
 
+.init gst_audio_convert_orc_init
+
 .function orc_audio_convert_unpack_u8
 .dest 4 d1 gint32
 .source 1 s1 guint8
diff --git a/gst/audioconvert/plugin.c b/gst/audioconvert/plugin.c
index 643737a8ad..45882dcfae 100644
--- a/gst/audioconvert/plugin.c
+++ b/gst/audioconvert/plugin.c
@@ -26,10 +26,13 @@
 #include "plugin.h"
 
 #include <gst/audio/multichannel.h>
+#include "gstaudioconvertorc.h"
 
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
+  gst_audio_convert_orc_init ();
+
   /* ensure GstAudioChannelPosition type is registered */
   if (!gst_audio_channel_position_get_type ())
     return FALSE;
diff --git a/gst/videoscale/gstvideoscale.c b/gst/videoscale/gstvideoscale.c
index b3aeb21079..b0f8f436b8 100644
--- a/gst/videoscale/gstvideoscale.c
+++ b/gst/videoscale/gstvideoscale.c
@@ -79,6 +79,7 @@
 #include <gst/video/video.h>
 
 #include "gstvideoscale.h"
+#include "gstvideoscaleorc.h"
 #include "vs_image.h"
 #include "vs_4tap.h"
 #include "vs_fill_borders.h"
@@ -1289,6 +1290,8 @@ gst_video_scale_src_event (GstBaseTransform * trans, GstEvent * event)
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
+  gst_videoscale_orc_init ();
+
   if (!gst_element_register (plugin, "videoscale", GST_RANK_NONE,
           GST_TYPE_VIDEO_SCALE))
     return FALSE;
diff --git a/gst/videoscale/gstvideoscaleorc.orc b/gst/videoscale/gstvideoscaleorc.orc
index 45434fcd88..561f411c54 100644
--- a/gst/videoscale/gstvideoscaleorc.orc
+++ b/gst/videoscale/gstvideoscaleorc.orc
@@ -1,4 +1,6 @@
 
+.init gst_videoscale_orc_init
+
 .function orc_merge_linear_u8
 .dest 1 d1
 .source 1 s1
diff --git a/gst/videotestsrc/gstvideotestsrc.c b/gst/videotestsrc/gstvideotestsrc.c
index 35f12926a9..fe3a99b569 100644
--- a/gst/videotestsrc/gstvideotestsrc.c
+++ b/gst/videotestsrc/gstvideotestsrc.c
@@ -37,6 +37,7 @@
 #include "config.h"
 #endif
 #include "gstvideotestsrc.h"
+#include "gstvideotestsrcorc.h"
 #include "videotestsrc.h"
 
 #include <string.h>
@@ -919,6 +920,8 @@ gst_video_test_src_start (GstBaseSrc * basesrc)
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
+  gst_videotestsrc_orc_init ();
+
   GST_DEBUG_CATEGORY_INIT (video_test_src_debug, "videotestsrc", 0,
       "Video Test Source");
 
diff --git a/gst/videotestsrc/gstvideotestsrcorc.orc b/gst/videotestsrc/gstvideotestsrcorc.orc
index 30097fd877..a2fc80b493 100644
--- a/gst/videotestsrc/gstvideotestsrcorc.orc
+++ b/gst/videotestsrc/gstvideotestsrcorc.orc
@@ -1,4 +1,6 @@
 
+.init gst_videotestsrc_orc_init
+
 .function gst_orc_splat_u8
 .dest 1 d1 guint8
 .param 1 p1
diff --git a/gst/volume/gstvolume.c b/gst/volume/gstvolume.c
index 269f71247c..c37eeea79a 100644
--- a/gst/volume/gstvolume.c
+++ b/gst/volume/gstvolume.c
@@ -1078,6 +1078,8 @@ volume_get_property (GObject * object, guint prop_id, GValue * value,
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
+  gst_volume_orc_init ();
+
   /* initialize gst controller library */
   gst_controller_init (NULL, NULL);
 
diff --git a/gst/volume/gstvolumeorc.orc b/gst/volume/gstvolumeorc.orc
index 0f6da91606..8e100a4d6b 100644
--- a/gst/volume/gstvolumeorc.orc
+++ b/gst/volume/gstvolumeorc.orc
@@ -1,4 +1,6 @@
 
+.init gst_volume_orc_init
+
 .function orc_scalarmultiply_f32_ns
 .dest 4 d1 float
 .source 4 s1 float