[beast: 1/11] BSE: rename bse_bindtextdomain()



commit a64ea5d336e08204fc4afc46a9433130e7d37cc7
Author: Tim Janik <timj gnu org>
Date:   Mon Sep 7 18:15:05 2015 +0200

    BSE: rename bse_bindtextdomain()

 bse/bsemain.cc  |    7 ++++---
 bse/bsemain.hh  |    8 +++-----
 shell/bsescm.cc |    4 ++--
 3 files changed, 9 insertions(+), 10 deletions(-)
---
diff --git a/bse/bsemain.cc b/bse/bsemain.cc
index a9cc3a1..6e94c1d 100644
--- a/bse/bsemain.cc
+++ b/bse/bsemain.cc
@@ -53,8 +53,9 @@ static BseMainArgs       default_main_args = {
 BseMainArgs             *bse_main_args = NULL;
 
 // == BSE Initialization ==
+/// Bind the BSE text domain, so bse_gettext() becomes usable; maybe called before initializing BSE.
 void
-bse_init_textdomain_only (void)
+bse_bindtextdomain()
 {
   bindtextdomain (BSE_GETTEXT_DOMAIN, BST_PATH_LOCALE);
   bind_textdomain_codeset (BSE_GETTEXT_DOMAIN, "UTF-8");
@@ -74,7 +75,7 @@ void
 _bse_init_async (int *argc, char **argv, const char *app_name, const Bse::StringVector &args)
 {
   assert (async_bse_thread.get_id() == std::thread::id());      // no async_bse_thread started
-  bse_init_textdomain_only();
+  bse_bindtextdomain();
   if (bse_initialization_stage != 0)
     g_error ("%s() may only be called once", "bse_init_async");
   bse_initialization_stage++;
@@ -222,7 +223,7 @@ server_registration (SfiProxy            server,
 static void
 bse_init_intern (int *argc, char **argv, const char *app_name, const Bse::StringVector &args, bool as_test)
 {
-  bse_init_textdomain_only();
+  bse_bindtextdomain();
 
   if (bse_initialization_stage != 0)
     g_error ("%s() may only be called once", "bse_init_intern");
diff --git a/bse/bsemain.hh b/bse/bsemain.hh
index 9afd542..72367b0 100644
--- a/bse/bsemain.hh
+++ b/bse/bsemain.hh
@@ -5,14 +5,12 @@
 G_BEGIN_DECLS
 
 // == BSE Initialization ==
-void           bse_init_textdomain_only (void);
-void           _bse_init_async          (int *argc, char **argv, const char *app_name, const 
Bse::StringVector &args);
-SfiGlueContext* _bse_glue_context_create (const char *client, const std::function<void()> &caller_wakeup);
-
-/* initialization for internal utilities */
+void bse_bindtextdomain ();
+void _bse_init_async   (int *argc, char **argv, const char *app_name, const Bse::StringVector &args);
 void bse_init_inprocess        (int *argc, char **argv, const char *app_name, const Bse::StringVector &args 
= Bse::StringVector());
 void bse_init_test     (int *argc, char **argv, const Bse::StringVector &args = Bse::StringVector());
 void bse_main_wakeup    ();
+SfiGlueContext* _bse_glue_context_create (const char *client, const std::function<void()> &caller_wakeup);
 
 /* --- global macros --- */
 #define        BSE_THREADS_ENTER()                     // bse_main_global_lock ()
diff --git a/shell/bsescm.cc b/shell/bsescm.cc
index 3710851..50ad41b 100644
--- a/shell/bsescm.cc
+++ b/shell/bsescm.cc
@@ -4,7 +4,7 @@
 #include <unistd.h>
 #include <guile/gh.h>
 #include <bse/bse.hh>
-#include <bse/bsemain.hh>  /* for bse_init_textdomain_only() */
+#include <bse/bsemain.hh>       // bse_bindtextdomain
 #include <sfi/sfistore.hh> /* no bin-compat */
 #include <sys/time.h>
 #include <libintl.h>
@@ -49,7 +49,7 @@ main (int   argc,
   const gchar *env_str;
   GSource *source;
   sfi_init (&argc, argv, "BSESCM");
-  bse_init_textdomain_only();
+  bse_bindtextdomain();
   setlocale (LC_ALL, "");
   env_str = g_getenv ("BSESCM_SLEEP4GDB");
   if (env_str && atoi (env_str) >= 3)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]