[beast: 7/10] SFI: remove (mostly useless) 'app_name' argument from sfi_init()



commit 65a17e4937005df4189e83eac99c82d612719c35
Author: Tim Janik <timj gnu org>
Date:   Sun Jan 24 20:39:18 2016 +0100

    SFI: remove (mostly useless) 'app_name' argument from sfi_init()
    
    Signed-off-by: Tim Janik <timj gnu org>

 beast-gtk/bstmain.cc |    2 +-
 beast-gtk/testgui.cc |    2 +-
 bse/bsemain.cc       |    2 +-
 sfi/sfitests.hh      |    2 +-
 sfi/sfiwrapper.cc    |    4 ++--
 sfi/sfiwrapper.hh    |    2 +-
 shell/bsescm.cc      |    2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/beast-gtk/bstmain.cc b/beast-gtk/bstmain.cc
index ec2ec37..6a9d111 100644
--- a/beast-gtk/bstmain.cc
+++ b/beast-gtk/bstmain.cc
@@ -105,7 +105,7 @@ main (int argc, char *argv[])
   Bse::TaskRegistry::add (Rapicorn::ThreadInfo::self().name(), Rapicorn::ThisThread::process_pid(), 
Rapicorn::ThisThread::thread_pid());
 
   /* initialize Birnet/Sfi */
-  sfi_init (&argc, argv, "BEAST");
+  sfi_init (&argc, argv);
   /* ensure SFI can wake us up */
 
   // early arg parsing without remote calls
diff --git a/beast-gtk/testgui.cc b/beast-gtk/testgui.cc
index 68467b3..d6baa32 100644
--- a/beast-gtk/testgui.cc
+++ b/beast-gtk/testgui.cc
@@ -81,7 +81,7 @@ main (int   argc,
   setlocale (LC_ALL, "");
 
   /* initialize Sfi */
-  sfi_init (&argc, argv, "TestGUI");
+  sfi_init (&argc, argv);
   /* initialize Gtk+ and enter threading mode */
   gtk_init (&argc, &argv);
   g_set_prgname ("testgui");            /* override Gdk's program name */
diff --git a/bse/bsemain.cc b/bse/bsemain.cc
index 92f55aa..51c7c86 100644
--- a/bse/bsemain.cc
+++ b/bse/bsemain.cc
@@ -215,7 +215,7 @@ initialize_with_argv (int *argc, char **argv, const char *app_name, const Bse::S
   if (initialized_for_unit_testing > 0)
     sfi_init_test (argc, argv);
   else
-    sfi_init (argc, argv, app_name);
+    sfi_init (argc, argv);
 }
 
 void
diff --git a/sfi/sfitests.hh b/sfi/sfitests.hh
index dc31907..99d9dc2 100644
--- a/sfi/sfitests.hh
+++ b/sfi/sfitests.hh
@@ -8,7 +8,7 @@
 static void RAPICORN_UNUSED
 sfi_init_test (int *argcp, char **argv)
 {
-  sfi_init (argcp, argv, RAPICORN_PRETTY_FILE, Bse::cstrings_to_vector ("rapicorn-test-initialization=1", 
NULL));
+  sfi_init (argcp, argv, Bse::cstrings_to_vector ("rapicorn-test-initialization=1", NULL));
   unsigned int flags = g_log_set_always_fatal ((GLogLevelFlags) G_LOG_FATAL_MASK);
   g_log_set_always_fatal ((GLogLevelFlags) (flags | G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL));
 }
diff --git a/sfi/sfiwrapper.cc b/sfi/sfiwrapper.cc
index 54feece..3ed537d 100644
--- a/sfi/sfiwrapper.cc
+++ b/sfi/sfiwrapper.cc
@@ -43,14 +43,14 @@ bse_flipper_check (const char *key)
 
 /* --- initialization --- */
 void
-sfi_init (int *argcp, char **argv, const char *app_name, const Bse::StringVector &args)
+sfi_init (int *argcp, char **argv, const Bse::StringVector &args)
 {
   static bool initialized = false;
   if (initialized)
     return;
   char *prg_name = argcp && *argcp ? g_path_get_basename (argv[0]) : NULL;
   if (args.size() == 1 && args[0] == "rapicorn-test-initialization=1")
-    Rapicorn::init_core_test (app_name ? app_name : prg_name, argcp, argv);
+    Rapicorn::init_core_test (prg_name, argcp, argv);
   else
     Rapicorn::parse_init_args (argcp, argv);
 
diff --git a/sfi/sfiwrapper.hh b/sfi/sfiwrapper.hh
index cb6bec5..f149753 100644
--- a/sfi/sfiwrapper.hh
+++ b/sfi/sfiwrapper.hh
@@ -48,7 +48,7 @@ typedef struct
   const char *value_string;
   long double value_num;        /* valid if value_string == NULL */
 } SfiInitValue;
-void sfi_init (int *argcp, char **argv, const char *app_name, const Bse::StringVector &args = 
Bse::StringVector());
+void sfi_init (int *argcp, char **argv, const Bse::StringVector &args = Bse::StringVector());
 
 /* --- file tests --- */
 bool   birnet_file_check (const char *file,
diff --git a/shell/bsescm.cc b/shell/bsescm.cc
index f229584..9dd9543 100644
--- a/shell/bsescm.cc
+++ b/shell/bsescm.cc
@@ -48,7 +48,7 @@ main (int   argc,
 {
   const gchar *env_str;
   GSource *source;
-  sfi_init (&argc, argv, "BSESCM");
+  sfi_init (&argc, argv);
   bse_bindtextdomain();
   setlocale (LC_ALL, "");
   env_str = g_getenv ("BSESCM_SLEEP4GDB");


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