[beast: 26/43] SFI: use Bse::info() for runtime messages



commit 0a8bd7162a1e810c05c3e4d02c822a9f65cee3c9
Author: Tim Janik <timj gnu org>
Date:   Sun Jun 25 19:37:38 2017 +0200

    SFI: use Bse::info() for runtime messages
    
    Signed-off-by: Tim Janik <timj gnu org>

 sfi/sfidl-corecxx.cc |    4 ++--
 sfi/sfiglue.cc       |    2 +-
 sfi/sfigluecodec.cc  |   16 ++++++++--------
 sfi/sfiglueproxy.cc  |   30 +++++++++++++++---------------
 sfi/sfistore.cc      |   10 +++++-----
 5 files changed, 31 insertions(+), 31 deletions(-)
---
diff --git a/sfi/sfidl-corecxx.cc b/sfi/sfidl-corecxx.cc
index 596f4fa..227b17d 100644
--- a/sfi/sfidl-corecxx.cc
+++ b/sfi/sfidl-corecxx.cc
@@ -1257,10 +1257,10 @@ public:
         if (!is_void)
           printf ("      %s (out_values, __return_value);\n", func_value_set_param (mi->result.type));
         printf ("    } catch (std::exception &e) {\n");
-        printf ("      sfi_diag (\"%%s: %%s\", \"%s\", e.what());\n", name);
+        printf ("      Bse::info (\"%%s: %%s\", \"%s\", e.what());\n", name);
         printf ("      return Bse::Error::PROC_EXECUTION;\n");
         printf ("    } catch (...) {\n");
-        printf ("      sfi_diag (\"%%s: %%s\", \"%s\", \"uncaught exception\");\n", name);
+        printf ("      Bse::info (\"%%s: %%s\", \"%s\", \"uncaught exception\");\n", name);
         printf ("      return Bse::Error::PROC_EXECUTION;\n");
         printf ("    }\n");
         printf ("    return Bse::Error::NONE;\n");
diff --git a/sfi/sfiglue.cc b/sfi/sfiglue.cc
index 29a53ee..5aee004 100644
--- a/sfi/sfiglue.cc
+++ b/sfi/sfiglue.cc
@@ -327,7 +327,7 @@ sfi_glue_call_valist (const gchar *proc_name,
        }
       if (error)
        {
-         sfi_diag ("%s: %s", G_STRLOC, error);
+         Bse::info ("%s: %s", G_STRLOC, error);
          g_free (error);
          sfi_seq_unref (seq);
          return NULL;
diff --git a/sfi/sfigluecodec.cc b/sfi/sfigluecodec.cc
index ffca6ba..3a6892c 100644
--- a/sfi/sfigluecodec.cc
+++ b/sfi/sfigluecodec.cc
@@ -118,25 +118,25 @@ encoder_process_message (SfiGlueEncoder *encoder,
              return TRUE;
            }
          else
-           sfi_diag ("ignoring message with spurious return value");
+            Bse::info ("ignoring message with spurious return value");
          break;
        case SFI_GLUE_CODEC_ASYNC_MESSAGE:
-          sfi_diag ("ignoring message with invalid message contents");
+          Bse::info ("ignoring message with invalid message contents");
          break;
        case SFI_GLUE_CODEC_ASYNC_EVENT:
          seq = seq->n_elements >= 2 ? sfi_seq_get_seq (seq, 1) : NULL;
          if (seq)
            encoder->events = sfi_ring_append (encoder->events, sfi_seq_ref (seq));
          else
-           sfi_diag ("ignoring message with NULL event");
+           Bse::info ("ignoring message with NULL event");
          break;
        default:
-         sfi_diag ("ignoring message with invalid ID: %u", cmd);
+         Bse::info ("ignoring message with invalid ID: %u", cmd);
          break;
        }
     }
   else
-    sfi_diag ("ignoring message of invalid type: %s", G_VALUE_TYPE_NAME (value));
+    Bse::info ("ignoring message of invalid type: %s", G_VALUE_TYPE_NAME (value));
   sfi_value_free (value);
 
   return FALSE;
@@ -722,7 +722,7 @@ decoder_proxy_processed_notify (SfiGlueDecoder *decoder,
   if (seq->n_elements >= 2)
     _sfi_glue_proxy_processed_notify (sfi_seq_get_int (seq, 1));
   else
-    sfi_diag ("ignoring invalid \"processed notify\" receipt");
+    Bse::info ("ignoring invalid \"processed notify\" receipt");
 }
 
 static GValue*
@@ -824,7 +824,7 @@ decoder_process_request (SfiGlueDecoder *decoder,
   if (!seq || seq->n_elements < 1)
     {
       *one_way = FALSE;
-      sfi_diag ("discarding invalid empty request");
+      Bse::info ("discarding invalid empty request");
       return NULL;
     }
   *one_way = FALSE;
@@ -879,7 +879,7 @@ decoder_process_request (SfiGlueDecoder *decoder,
     case SFI_GLUE_CODEC_CLIENT_MSG:
       return decoder_client_msg (decoder, seq);
     }
-  sfi_diag ("ignoring request with invalid ID: %d", cmd);
+  Bse::info ("ignoring request with invalid ID: %d", cmd);
   return NULL;
 }
 
diff --git a/sfi/sfiglueproxy.cc b/sfi/sfiglueproxy.cc
index 970913f..b71026d 100644
--- a/sfi/sfiglueproxy.cc
+++ b/sfi/sfiglueproxy.cc
@@ -255,10 +255,10 @@ sfi_glue_proxy_signal (SfiGlueContext *context,
            }
        }
       else
-       sfi_diag ("spurious unknown signal \"%s\" on proxy (%lu)", signal, proxy);
+       Bse::info ("spurious unknown signal \"%s\" on proxy (%lu)", signal, proxy);
     }
   else
-    sfi_diag ("spurious signal \"%s\" on non existing proxy (%lu)", signal, proxy);
+    Bse::info ("spurious signal \"%s\" on non existing proxy (%lu)", signal, proxy);
 }
 
 static void
@@ -330,7 +330,7 @@ sfi_glue_signal_connect_closure (SfiProxy       proxy,
        }
       else
        {
-         sfi_diag ("no such signal \"%s\" on proxy (%lu) to connect to", signal, proxy);
+         Bse::info ("no such signal \"%s\" on proxy (%lu) to connect to", signal, proxy);
          sfi_glue_gc_add (closure, SfiGlueGcFreeFunc (g_closure_unref));
        }
     }
@@ -390,8 +390,8 @@ sfi_glue_signal_disconnect (SfiProxy     proxy,
            }
        }
     }
-  sfi_diag ("%s: proxy (%lu) has no signal connection (%lu) to disconnect",
-           G_STRLOC, proxy, connection_id);
+  Bse::info ("%s: proxy (%lu) has no signal connection (%lu) to disconnect",
+             G_STRLOC, proxy, connection_id);
 }
 
 static GSList*
@@ -477,7 +477,7 @@ sfi_glue_proxy_connect (SfiProxy     proxy,
                                         g_cclosure_new_object_swap (GCallback (callback), (GObject*) data), 
callback);
       else
        {
-         sfi_diag ("%s: invalid signal spec \"%s\"", G_STRLOC, signal);
+         Bse::info ("%s: invalid signal spec \"%s\"", G_STRLOC, signal);
          break;
        }
       signal = va_arg (var_args, gchar*);
@@ -521,7 +521,7 @@ sfi_glue_proxy_disconnect (SfiProxy     proxy,
        }
       else
        {
-         sfi_diag ("%s: invalid signal spec \"%s\"", G_STRLOC, signal);
+         Bse::info ("%s: invalid signal spec \"%s\"", G_STRLOC, signal);
          break;
        }
       if (!slist)
@@ -722,7 +722,7 @@ sfi_glue_proxy_weak_unref (SfiProxy        proxy,
              }
        }
       if (!found_one)
-       sfi_diag ("%s: proxy (%lu) has no weak ref %p(%p)", G_STRLOC, proxy, weak_notify, data);
+       Bse::info ("%s: proxy (%lu) has no weak ref %p(%p)", G_STRLOC, proxy, weak_notify, data);
     }
 }
 
@@ -868,7 +868,7 @@ sfi_glue_proxy_set (SfiProxy     proxy,
        error = g_strdup_format ("unknown property \"%s\"", prop);
       if (error)
        {
-         sfi_diag ("%s: %s", G_STRLOC, error);
+         Bse::info ("%s: %s", G_STRLOC, error);
          g_free (error);
          break;
        }
@@ -901,7 +901,7 @@ sfi_glue_proxy_get (SfiProxy     proxy,
         error = g_strdup_format ("unknown property \"%s\"", prop);
       if (error)
        {
-         sfi_diag ("%s: %s", G_STRLOC, error);
+         Bse::info ("%s: %s", G_STRLOC, error);
          g_free (error);
          break;
        }
@@ -932,7 +932,7 @@ _sfi_glue_proxy_dispatch_event (SfiSeq *event)
       if (proxy)
        sfi_glue_proxy_release (context, proxy);
       else
-       sfi_diag ("%s: release event without proxy", G_STRLOC);
+       Bse::info ("%s: release event without proxy", G_STRLOC);
       break;
     case SFI_GLUE_EVENT_NOTIFY:
       signal = sfi_seq_get_string (event, 1);
@@ -942,11 +942,11 @@ _sfi_glue_proxy_dispatch_event (SfiSeq *event)
       if (notify_id && proxy && signal && signal[0])
        sfi_glue_proxy_signal (context, proxy, signal, args);
       else if (!notify_id)
-       sfi_diag ("%s: signal event without notify id", G_STRLOC);
+       Bse::info ("%s: signal event without notify id", G_STRLOC);
       else if (!proxy)
-       sfi_diag ("%s: signal event without proxy", G_STRLOC);
+       Bse::info ("%s: signal event without proxy", G_STRLOC);
       else
-       sfi_diag ("%s: signal event without name", G_STRLOC);
+       Bse::info ("%s: signal event without name", G_STRLOC);
       if (notify_id)
        _sfi_glue_proxy_processed_notify (notify_id);
       break;
@@ -956,7 +956,7 @@ _sfi_glue_proxy_dispatch_event (SfiSeq *event)
        _sfi_glue_proxy_processed_notify (notify_id);
       break;
     default:
-      sfi_diag ("%s: ignoring bogus event (type=%u)", G_STRLOC, event_type);
+      Bse::info ("%s: ignoring bogus event (type=%u)", G_STRLOC, event_type);
       break;
     }
   glue_proxy_dispatching = FALSE;
diff --git a/sfi/sfistore.cc b/sfi/sfistore.cc
index ba9a343..485bbcd 100644
--- a/sfi/sfistore.cc
+++ b/sfi/sfistore.cc
@@ -182,12 +182,12 @@ sfi_wstore_put_param (SfiWStore      *wstore,
       if (g_param_value_validate (spspec, &svalue))
        {
          if (G_VALUE_TYPE (&svalue) != G_VALUE_TYPE (value))
-           sfi_diag ("fixing up value for \"%s\" of type `%s' (converted from `%s')",
-                     pspec->name, g_type_name (G_VALUE_TYPE (&svalue)),
-                     g_type_name (G_VALUE_TYPE (value)));
+           Bse::info ("fixing up value for \"%s\" of type `%s' (converted from `%s')",
+                       pspec->name, g_type_name (G_VALUE_TYPE (&svalue)),
+                       g_type_name (G_VALUE_TYPE (value)));
          else
-           sfi_diag ("fixing up value for \"%s\" of type `%s'",
-                     pspec->name, g_type_name (G_VALUE_TYPE (&svalue)));
+           Bse::info ("fixing up value for \"%s\" of type `%s'",
+                       pspec->name, g_type_name (G_VALUE_TYPE (&svalue)));
        }
       sfi_value_store_param (&svalue, gstring, spspec, wstore->indent);
       sfi_wstore_break (wstore);


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