GNOME.org
 

[beast: 40/57] BST: adjust for having 'Aida' as independent toplevel namespace

commit 025ae2dffa65bb8a30b4d4411eff9a50d58d654e
Author: Tim Janik <timj gnu org>
Date:   Mon Jul 17 11:50:05 2017 +0200

    BST: adjust for having 'Aida' as independent toplevel namespace
    
    Signed-off-by: Tim Janik <timj gnu org>

 beast-gtk/bstapp.cc         |    2 +-
 beast-gtk/bstbseutils.cc    |    2 +-
 beast-gtk/bstmain.cc        |    2 +-
 beast-gtk/bstparam.cc       |   16 ++++++++--------
 beast-gtk/bstparam.hh       |    2 +-
 beast-gtk/bstparamview.cc   |    8 ++++----
 beast-gtk/bstpartdialog.cc  |    4 ++--
 beast-gtk/bstpatternctrl.cc |    6 +++---
 beast-gtk/bstscrollgraph.cc |    8 ++++----
 beast-gtk/bstusermessage.cc |    4 ++--
 10 files changed, 27 insertions(+), 27 deletions(-)
---
diff --git a/beast-gtk/bstapp.cc b/beast-gtk/bstapp.cc
index e2d127f..b3bf070 100644
--- a/beast-gtk/bstapp.cc
+++ b/beast-gtk/bstapp.cc
@@ -1074,7 +1074,7 @@ app_action_exec (gpointer data,
                                      "are currently looking at a prominent warning or error message, there's 
no "
                                      "real merit to it."),
                       BST_MSG_TEXT3 ("Demo-Dialog-Type: %s",
-                                     Rapicorn::Aida::enum_info<Bse::UserMessageType>().find_value 
(demo_type).ident));
+                                     Aida::enum_info<Bse::UserMessageType>().find_value (demo_type).ident));
       break;
     default:
       assert_return_unreached ();
diff --git a/beast-gtk/bstbseutils.cc b/beast-gtk/bstbseutils.cc
index b2362bd..d88b26e 100644
--- a/beast-gtk/bstbseutils.cc
+++ b/beast-gtk/bstbseutils.cc
@@ -93,7 +93,7 @@ namespace Bse {
 const char*
 error_blurb (Bse::Error error_value)
 {
-  const Rapicorn::Aida::EnumValue ev = Rapicorn::Aida::enum_info<Bse::Error>().find_value (error_value);
+  const Aida::EnumValue ev = Aida::enum_info<Bse::Error>().find_value (error_value);
   return ev.blurb;
 }
 
diff --git a/beast-gtk/bstmain.cc b/beast-gtk/bstmain.cc
index 9c5b9c6..ecfed9f 100644
--- a/beast-gtk/bstmain.cc
+++ b/beast-gtk/bstmain.cc
@@ -624,7 +624,7 @@ bst_init_aida_idl()
 {
   assert (bse_server == NULL);
   // connect to BSE thread and fetch server handle
-  Bse::Aida::ClientConnectionP connection = Bse::init_server_connection();
+  Aida::ClientConnectionP connection = Bse::init_server_connection();
   assert (connection != NULL);
   bse_server = Bse::init_server_instance();
   assert (bse_server != NULL);
diff --git a/beast-gtk/bstparam.cc b/beast-gtk/bstparam.cc
index d3eefc5..8087d8d 100644
--- a/beast-gtk/bstparam.cc
+++ b/beast-gtk/bstparam.cc
@@ -387,7 +387,7 @@ bst_param_new_rec (GParamSpec *pspec,
 static void
 aida_parameter_binding_set_value (GxkParam *param, const GValue *value)
 {
-  Rapicorn::Aida::Parameter *const apa = (Rapicorn::Aida::Parameter*) param->bdata[0].v_pointer;
+  Aida::Parameter *const apa = (Aida::Parameter*) param->bdata[0].v_pointer;
   Any any;
   switch (G_TYPE_FUNDAMENTAL (G_VALUE_TYPE (value)))
     {
@@ -403,7 +403,7 @@ aida_parameter_binding_set_value (GxkParam *param, const GValue *value)
     case G_TYPE_STRING:
       if (G_VALUE_TYPE (value) == SFI_TYPE_CHOICE)      // sfi_pspec_choice
         {
-          const Rapicorn::Aida::EnumInfo &enum_info = *(const Rapicorn::Aida::EnumInfo*) 
param->bdata[1].v_pointer;
+          const Aida::EnumInfo &enum_info = *(const Aida::EnumInfo*) param->bdata[1].v_pointer;
           assert_return (NULL != &enum_info);
           any.set_enum (enum_info, enum_info.value_from_string (sfi_value_get_choice (value)));
         }
@@ -420,7 +420,7 @@ aida_parameter_binding_set_value (GxkParam *param, const GValue *value)
 static void
 aida_parameter_binding_get_value (GxkParam *param, GValue *param_value)
 {
-  Rapicorn::Aida::Parameter *const apa = (Rapicorn::Aida::Parameter*) param->bdata[0].v_pointer;
+  Aida::Parameter *const apa = (Aida::Parameter*) param->bdata[0].v_pointer;
   Any any = apa->get();
   GValue value = { 0, };
   switch (G_TYPE_FUNDAMENTAL (G_PARAM_SPEC_VALUE_TYPE (param->pspec)))
@@ -440,7 +440,7 @@ aida_parameter_binding_get_value (GxkParam *param, GValue *param_value)
     case G_TYPE_STRING:
       if (G_PARAM_SPEC_VALUE_TYPE (param->pspec) == SFI_TYPE_CHOICE)    // sfi_pspec_choice
         {
-          const Rapicorn::Aida::EnumInfo &enum_info = any.get_enum_info();
+          const Aida::EnumInfo &enum_info = any.get_enum_info();
           g_value_init (&value, SFI_TYPE_CHOICE);
           sfi_value_set_choice (&value, enum_info.value_to_string (any.as_int64()).c_str());
           param->bdata[1].v_pointer = (void*) &enum_info;
@@ -465,7 +465,7 @@ aida_parameter_binding_get_value (GxkParam *param, GValue *param_value)
 static void
 aida_parameter_binding_destroy (GxkParam *param)
 {
-  Rapicorn::Aida::Parameter *const cxxparam = (Rapicorn::Aida::Parameter*) param->bdata[0].v_pointer;
+  Aida::Parameter *const cxxparam = (Aida::Parameter*) param->bdata[0].v_pointer;
   param->bdata[0].v_pointer = NULL;
   delete cxxparam;
 }
@@ -473,7 +473,7 @@ aida_parameter_binding_destroy (GxkParam *param)
 static gboolean
 aida_parameter_binding_check_writable (GxkParam *param)
 {
-  // Rapicorn::Aida::Parameter *const cxxparam = (Rapicorn::Aida::Parameter*) param->bdata[0].v_pointer;
+  // Aida::Parameter *const cxxparam = (Aida::Parameter*) param->bdata[0].v_pointer;
   // assert (cxxparam);
   return true;
 }
@@ -488,10 +488,10 @@ static GxkParamBinding aida_parameter_binding = {
 };
 
 GxkParam*
-bst_param_new_aida_parameter (GParamSpec *pspec, const Rapicorn::Aida::Parameter &aparameter)
+bst_param_new_aida_parameter (GParamSpec *pspec, const Aida::Parameter &aparameter)
 {
   GxkParam *param = gxk_param_new (pspec, &aida_parameter_binding, NULL);
-  Rapicorn::Aida::Parameter *cxxparam = new Rapicorn::Aida::Parameter (aparameter);
+  Aida::Parameter *cxxparam = new Aida::Parameter (aparameter);
   param->bdata[0].v_pointer = cxxparam;
   param->bdata[1].v_pointer = NULL;
   auto handler = [param] (const String &what) {
diff --git a/beast-gtk/bstparam.hh b/beast-gtk/bstparam.hh
index d5c63a0..ed20c6e 100644
--- a/beast-gtk/bstparam.hh
+++ b/beast-gtk/bstparam.hh
@@ -40,7 +40,7 @@ SfiProxy     bst_param_get_proxy      (GxkParam    *param);
 bool         bst_param_is_proxy       (GxkParam    *param);
 SfiProxy     bst_item_seq_list_match  (GSList      *proxy_seq_slist,    /* bstparam-proxy.cc */
                                        const gchar *text);
-GxkParam* bst_param_new_aida_parameter (GParamSpec *pspec, const Rapicorn::Aida::Parameter &aparameter);
+GxkParam* bst_param_new_aida_parameter (GParamSpec *pspec, const Aida::Parameter &aparameter);
 
 
 /* --- param implementation utils --- */
diff --git a/beast-gtk/bstparamview.cc b/beast-gtk/bstparamview.cc
index 8971b1e..90c4536 100644
--- a/beast-gtk/bstparamview.cc
+++ b/beast-gtk/bstparamview.cc
@@ -210,17 +210,17 @@ bst_param_view_rebuild (BstParamView *self)
   Bse::SongH song = Bse::SongH::down_cast (bse_server.from_proxy (self->item));
   Bse::SNetH snet = Bse::SNetH::down_cast (bse_server.from_proxy (self->item));
   std::vector<GParamSpec*> cxxpspecs;
-  std::vector<Rapicorn::Aida::Parameter> cxxparams;
+  std::vector<Aida::Parameter> cxxparams;
   if (song)
     {
       cxxpspecs = Bse::sfi_pspecs_fields_from_accessor_visitable (song);
-      Rapicorn::Aida::Parameter::ListVisitor av (cxxparams);
+      Aida::Parameter::ListVisitor av (cxxparams);
       song.__accept_accessor__ (av);
     }
   else if (snet)
     {
       cxxpspecs = Bse::sfi_pspecs_fields_from_accessor_visitable (snet);
-      Rapicorn::Aida::Parameter::ListVisitor av (cxxparams);
+      Aida::Parameter::ListVisitor av (cxxparams);
       snet.__accept_accessor__ (av);
     }
 
@@ -235,7 +235,7 @@ bst_param_view_rebuild (BstParamView *self)
       {
         GParamSpec *pspec = cxxpspecs[i];
         const gchar *param_group = sfi_pspec_get_group (pspec);
-        Rapicorn::Aida::Parameter *cxxparam = NULL;
+        Aida::Parameter *cxxparam = NULL;
         for (size_t j = 0; j < cxxparams.size() && !cxxparam; j++)
           if (g_sname_equals (cxxparams[j].name(), pspec->name))
             cxxparam = &cxxparams[j];
diff --git a/beast-gtk/bstpartdialog.cc b/beast-gtk/bstpartdialog.cc
index 3c4ae56..aa68dd2 100644
--- a/beast-gtk/bstpartdialog.cc
+++ b/beast-gtk/bstpartdialog.cc
@@ -93,7 +93,7 @@ eparam_changed (gpointer  data,
   BstPartDialog *self = BST_PART_DIALOG (data);
   if (self->eroll)
     {
-      Bse::MidiSignal midi_signal_type = Rapicorn::Aida::enum_value_from_string<Bse::MidiSignal> 
(sfi_value_get_choice (&param->value));
+      Bse::MidiSignal midi_signal_type = Aida::enum_value_from_string<Bse::MidiSignal> (sfi_value_get_choice 
(&param->value));
       bst_event_roll_set_control_type (self->eroll, midi_signal_type);
       gxk_widget_update_actions (self); /* update controllers */
     }
@@ -209,7 +209,7 @@ bst_part_dialog_init (BstPartDialog *self)
       GtkWidget *rwidget = gxk_param_create_editor (param, "choice-button");
       gxk_radget_add (radget, "event-roll-control-area", rwidget);
       g_object_connect (radget, "swapped_signal::destroy", gxk_param_destroy, param, NULL);
-      sfi_value_set_choice (&param->value, Rapicorn::Aida::enum_value_to_string<Bse::MidiSignal> 
(Bse::MidiSignal::VELOCITY).c_str());
+      sfi_value_set_choice (&param->value, Aida::enum_value_to_string<Bse::MidiSignal> 
(Bse::MidiSignal::VELOCITY).c_str());
       gxk_param_apply_value (param); /* update model, auto updates GUI */
     }
 
diff --git a/beast-gtk/bstpatternctrl.cc b/beast-gtk/bstpatternctrl.cc
index c259730..3035c7e 100644
--- a/beast-gtk/bstpatternctrl.cc
+++ b/beast-gtk/bstpatternctrl.cc
@@ -45,7 +45,7 @@ pattern_controller_vraster_notify (gpointer             notify_data,
     { int64 (NoteLength::NOTE_LENGTH_128T),        8 },
   };
   int vraster = 384;
-  const int64 vsval = int64 (Rapicorn::Aida::enum_value_from_string<NoteLength> (sfi_value_get_choice 
(&self->vraster->value)));
+  const int64 vsval = int64 (Aida::enum_value_from_string<NoteLength> (sfi_value_get_choice 
(&self->vraster->value)));
   for (uint i = 0; i < G_N_ELEMENTS (choices); i++)
     if (choices[i].value == vsval)
       {
@@ -82,7 +82,7 @@ pattern_controller_row_shading_notify (gpointer  notify_data,
     { int64 (RowShading::ROW_SHADING_6_12),     12, 6 },
   };
   int r1 = 0, r2 = 0, r3 = 0, r4 = 0;
-  const int64 vsval = int64 (Rapicorn::Aida::enum_value_from_string<RowShading> (sfi_value_get_choice 
(&self->row_shading->value)));
+  const int64 vsval = int64 (Aida::enum_value_from_string<RowShading> (sfi_value_get_choice 
(&self->row_shading->value)));
   for (uint i = 0; i < G_N_ELEMENTS (choices); i++)
     if (choices[i].value == vsval)
       {
@@ -271,7 +271,7 @@ pattern_controller_key_press (BstPatternController *self,
         case BST_PATTERN_JUMP_BOTTOM:   focus_row = bst_pattern_view_get_last_row (pview);      break;
         case BST_PATTERN_MOVE_NEXT:
           {
-            Bst::Direction d = Rapicorn::Aida::enum_value_from_string<Bst::Direction> (sfi_value_get_choice 
(&self->step_dir->value));
+            Bst::Direction d = Aida::enum_value_from_string<Bst::Direction> (sfi_value_get_choice 
(&self->step_dir->value));
             if (d == Bst::Direction::DIR_LEFT || d == Bst::Direction::DIR_RIGHT)
               focus_col += (d == Bst::Direction::DIR_LEFT ? -1 : +1) * g_value_get_int (&self->steps->value);
             else /* UP/DOWN */
diff --git a/beast-gtk/bstscrollgraph.cc b/beast-gtk/bstscrollgraph.cc
index cc5bd5e..62a9e0a 100644
--- a/beast-gtk/bstscrollgraph.cc
+++ b/beast-gtk/bstscrollgraph.cc
@@ -69,7 +69,7 @@ bst_scrollgraph_set_property (GObject      *object,
       gtk_widget_queue_draw (widget);
       break;
     case PROP_DIRECTION:
-      bst_scrollgraph_resize_values (self, Rapicorn::Aida::enum_value_from_string<Bst::Direction> 
(sfi_value_get_choice (value)));
+      bst_scrollgraph_resize_values (self, Aida::enum_value_from_string<Bst::Direction> 
(sfi_value_get_choice (value)));
       gtk_widget_queue_resize (widget);
       break;
     case PROP_BOOST:
@@ -77,7 +77,7 @@ bst_scrollgraph_set_property (GObject      *object,
       gtk_widget_queue_draw (widget);
       break;
     case PROP_WINDOW_SIZE:
-      self->window_size = int64 (Rapicorn::Aida::enum_value_from_string<Bst::FFTSize> (sfi_value_get_choice 
(value)));
+      self->window_size = int64 (Aida::enum_value_from_string<Bst::FFTSize> (sfi_value_get_choice (value)));
       bst_scrollgraph_resize_values (self, self->direction);
       gtk_widget_queue_resize (widget);
       break;
@@ -100,13 +100,13 @@ bst_scrollgraph_get_property (GObject     *object,
       sfi_value_set_bool (value, self->flip);
       break;
     case PROP_DIRECTION:
-      sfi_value_set_choice (value, Rapicorn::Aida::enum_value_to_string<Bst::Direction> 
(self->direction).c_str());
+      sfi_value_set_choice (value, Aida::enum_value_to_string<Bst::Direction> (self->direction).c_str());
       break;
     case PROP_BOOST:
       sfi_value_set_real (value, self->boost);
       break;
     case PROP_WINDOW_SIZE:
-      sfi_value_set_choice (value, Rapicorn::Aida::enum_info<Bst::FFTSize>().value_to_string 
(self->window_size).c_str());
+      sfi_value_set_choice (value, Aida::enum_info<Bst::FFTSize>().value_to_string 
(self->window_size).c_str());
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
diff --git a/beast-gtk/bstusermessage.cc b/beast-gtk/bstusermessage.cc
index 97f4a2e..f7f4be6 100644
--- a/beast-gtk/bstusermessage.cc
+++ b/beast-gtk/bstusermessage.cc
@@ -15,7 +15,7 @@ static GSList *msg_windows = NULL;
 const char*
 bst_msg_type_ident (BstMsgType bmt)
 {
-  const Rapicorn::Aida::EnumValue ev = Rapicorn::Aida::enum_info<Bse::UserMessageType>().find_value (bmt);
+  const Aida::EnumValue ev = Aida::enum_info<Bse::UserMessageType>().find_value (bmt);
   if (ev.ident)
     return ev.ident;
   switch (bmt)
@@ -761,7 +761,7 @@ server_user_message (const Bse::UserMessage &umsg)
   msg.details = umsg.text3.c_str();
   Bse::String cfg = Bse::string_format (_("Show messages about %s"), umsg.label.c_str());
   msg.config_check = cfg.c_str();
-  const Rapicorn::Aida::EnumValue ev = Rapicorn::Aida::enum_info<Bse::UserMessageType>().find_value 
(umsg.utype);
+  const Aida::EnumValue ev = Aida::enum_info<Bse::UserMessageType>().find_value (umsg.utype);
   msg.ident = ev.ident;
   msg.label = NULL;
   msg.janitor = 0;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]