[beast/devel: 65/77] BSE: use Rapicorn namespace

[Tim Janik <timj src gnome org>]

commit bf8f73f723cbcf0fbb9981eca8fe148891bcde62
Author: Tim Janik <timj gnu org>
Date:   Sun Apr 14 19:44:11 2013 +0200

    BSE: use Rapicorn namespace

 bse/bsecore.hh              |    2 +-
 bse/bsefilter.cc            |    7 +++++--
 bse/bsegconfig.cc           |    2 +-
 bse/bseladspa.cc            |   10 ++++++----
 bse/bsemain.cc              |    2 +-
 bse/bsemidireceiver.cc      |    1 -
 bse/bsenote.cc              |    2 +-
 bse/bseresamplerimpl.hh     |    4 ++--
 bse/tests/filtertest.cc     |    7 +++++--
 bse/tests/firhandle.cc      |    4 +++-
 bse/tests/resamplehandle.cc |    2 +-
 11 files changed, 26 insertions(+), 17 deletions(-)
---
diff --git a/bse/bsecore.hh b/bse/bsecore.hh
index 17bc171..7a3e190 100644
--- a/bse/bsecore.hh
+++ b/bse/bsecore.hh
@@ -7,7 +7,7 @@
 
 /// The Bse namespace contains all functions of the synthesis engine.
 namespace Bse {
-using namespace Birnet;         // FIXME: using Rapicorn
+using namespace Rapicorn;
 
 /// The task registry keeps track of runtime threads for profiling and statistical purposes.
 class TaskRegistry {            // FIXME: move this to IDL
diff --git a/bse/bsefilter.cc b/bse/bsefilter.cc
index 7501eae..4e397b0 100644
--- a/bse/bsefilter.cc
+++ b/bse/bsefilter.cc
@@ -1,8 +1,10 @@
 // CC0 Public Domain: http://creativecommons.org/publicdomain/zero/1.0/
 #include "bsefilter.hh"
-#include <birnet/birnet.hh>
-using namespace Birnet;
+#include <sfi/sfi.hh>
+using namespace Rapicorn;
+
 extern "C" {
+
 const gchar*
 bse_iir_filter_kind_string (BseIIRFilterKind fkind)
 {
@@ -97,4 +99,5 @@ bse_iir_filter_design (const BseIIRFilterRequest  *filter_request,
     return _bse_filter_design_ellf (filter_request, filter_design);
   return false;
 }
+
 } // C
diff --git a/bse/bsegconfig.cc b/bse/bsegconfig.cc
index b351b55..7b6ad6e 100644
--- a/bse/bsegconfig.cc
+++ b/bse/bsegconfig.cc
@@ -6,7 +6,7 @@
 #include <sys/types.h>
 #include <regex.h>
 
-using namespace Birnet;
+using namespace Rapicorn;
 
 // == Declarations ==
 static BseGConfig*    gconfig_from_rec  (SfiRec *rec);
diff --git a/bse/bseladspa.cc b/bse/bseladspa.cc
index 4e1f50a..43eaf29 100644
--- a/bse/bseladspa.cc
+++ b/bse/bseladspa.cc
@@ -2,10 +2,10 @@
 #include "bseladspa.hh"
 #include "bseladspamodule.hh"
 #include "bsecategories.hh"
-#include <birnet/birnet.hh>
+#include <sfi/sfi.hh>
 #include <string.h>
 #include "ladspa.hh"
-using namespace Birnet;
+using namespace Rapicorn;
 
 #define LDEBUG(...)     BSE_KEY_DEBUG ("ladspa", __VA_ARGS__)
 
@@ -58,6 +58,7 @@ ladspa_plugin_iface_init (GTypePluginClass *iface)
   iface->unuse_plugin = ladspa_plugin_unuse;
   iface->complete_type_info = ladspa_plugin_complete_info;
 }
+
 static void
 ladspa_plugin_use (GTypePlugin *gplugin)
 {
@@ -65,7 +66,7 @@ ladspa_plugin_use (GTypePlugin *gplugin)
   g_object_ref (self);
   if (!self->use_count)
     {
-      BIRNET_MAY_ALIAS LADSPA_Descriptor_Function ldf = NULL;
+      LADSPA_Descriptor_Function ldf = NULL;
       const gchar *error = NULL;
       self->use_count++;
       LDEBUG ("%s: reloading plugin", self->fname);
@@ -90,6 +91,7 @@ ladspa_plugin_use (GTypePlugin *gplugin)
   else
     self->use_count++;
 }
+
 static void
 ladspa_plugin_unload (BseLadspaPlugin *self)
 {
@@ -575,7 +577,7 @@ bse_ladspa_plugin_check_load (const gchar *file_name)
   if (!gmodule)
     return g_module_error ();
   /* check whether this is a LADSPA module */
-  BIRNET_MAY_ALIAS LADSPA_Descriptor_Function ldf = NULL;
+  LADSPA_Descriptor_Function ldf = NULL;
   if (!g_module_symbol (gmodule, "ladspa_descriptor", (void**) &ldf) || !ldf)
     {
       g_module_close (gmodule);
diff --git a/bse/bsemain.cc b/bse/bsemain.cc
index 323235f..d78a954 100644
--- a/bse/bsemain.cc
+++ b/bse/bsemain.cc
@@ -19,7 +19,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <sfi/sfitests.hh> /* sfti_test_init() */
-using namespace Birnet;
+using namespace Rapicorn;
 
 /* --- prototypes --- */
 static void    bse_main_loop           (Rapicorn::AsyncBlockingQueue<int> *init_queue);
diff --git a/bse/bsemidireceiver.cc b/bse/bsemidireceiver.cc
index 7f4cba9..170df7e 100644
--- a/bse/bsemidireceiver.cc
+++ b/bse/bsemidireceiver.cc
@@ -12,7 +12,6 @@
 #include <set>
 namespace {
 using namespace Bse;
-using namespace Birnet;
 using namespace std;
 
 #define MDEBUG(...)     BSE_KEY_DEBUG ("midi-receiver", __VA_ARGS__)
diff --git a/bse/bsenote.cc b/bse/bsenote.cc
index 74bd0ce..618ab07 100644
--- a/bse/bsenote.cc
+++ b/bse/bsenote.cc
@@ -4,7 +4,7 @@
 #include "bseieee754.hh"
 #include "bsemathsignal.hh"
 #include <string.h>
-#include <birnet/birnet.hh>
+#include <sfi/sfi.hh>
 /* --- functions --- */
 namespace {
 struct FreqCmp {
diff --git a/bse/bseresamplerimpl.hh b/bse/bseresamplerimpl.hh
index 5e8c886..e8d97d0 100644
--- a/bse/bseresamplerimpl.hh
+++ b/bse/bseresamplerimpl.hh
@@ -3,7 +3,7 @@
 #define __BSE_RESAMPLER_TCC__
 #include <vector>
 #include <bse/bseresampler.hh>
-#include <birnet/birnet.hh>
+#include <sfi/sfi.hh>
 #include <math.h>
 #include <string.h>
 #include <stdlib.h>
@@ -17,7 +17,7 @@ using std::vector;
 using std::min;
 using std::max;
 using std::copy;
-using Birnet::AlignedArray;
+
 /* see: http://ds9a.nl/gcc-simd/ */
 union F4Vector 
 {
diff --git a/bse/tests/filtertest.cc b/bse/tests/filtertest.cc
index 56afd4b..3280fc8 100644
--- a/bse/tests/filtertest.cc
+++ b/bse/tests/filtertest.cc
@@ -11,15 +11,18 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <complex>
-typedef std::complex<double> Complex;
-using namespace Birnet;
+using namespace Rapicorn;
 using std::max;
 using std::min;
+
+typedef std::complex<double> Complex;
+
 static inline double
 sqr (register double a)
 {
   return a * a;
 }
+
 static inline uint
 complex_find_nearest (const BseComplex *zp,
                       uint              n_zps,
diff --git a/bse/tests/firhandle.cc b/bse/tests/firhandle.cc
index a6bda95..fd90845 100644
--- a/bse/tests/firhandle.cc
+++ b/bse/tests/firhandle.cc
@@ -10,10 +10,12 @@
 #include <stdlib.h>
 #include <complex>
 #include <vector>
+using Rapicorn::string_printf;
+
 using std::vector;
 using std::min;
 using std::max;
-using Birnet::string_printf;
+
 static void
 read_through (GslDataHandle *handle)
 {
diff --git a/bse/tests/resamplehandle.cc b/bse/tests/resamplehandle.cc
index c8d6949..d75474c 100644
--- a/bse/tests/resamplehandle.cc
+++ b/bse/tests/resamplehandle.cc
@@ -154,7 +154,7 @@ generate_test_signal (vector<Sample> &signal,
           cached_window[i] = bse_window_blackman (wpos);
         }
     }
-  string signal_cache_key = Birnet::string_printf ("%zd/%.1f/%.1f/%.1f", signal_length, sample_rate, 
frequency1, frequency2);
+  string signal_cache_key = Rapicorn::string_printf ("%zd/%.1f/%.1f/%.1f", signal_length, sample_rate, 
frequency1, frequency2);
   static map<string, vector<Sample> > signal_cache;
   vector<Sample>& cached_signal = signal_cache[signal_cache_key];
   if (cached_signal.empty())