GNOME.org
 

[beast: 8/24] BEAST: use Rapicorn's printerr()

commit f9907cb343d890a8dfe1dfd8cb7df0c9471ae535
Author: Tim Janik <timj gnu org>
Date:   Tue Sep 22 22:18:37 2015 +0200

    BEAST: use Rapicorn's printerr()

 beast-gtk/bstapp.cc               |    4 ++--
 beast-gtk/bstdbmeter.cc           |    2 +-
 beast-gtk/bsteventrollctrl.cc     |    4 ++--
 beast-gtk/bstlogadjustment.cc     |    4 ++--
 beast-gtk/bstmain.cc              |    2 +-
 beast-gtk/bstpianorollctrl.cc     |    2 +-
 beast-gtk/gxk/gxklogadjustment.cc |    8 ++++----
 beast-gtk/gxk/gxkparam.cc         |    8 ++++----
 beast-gtk/gxk/gxkradget.cc        |    8 ++++----
 beast-gtk/gxk/gxkspline.cc        |   20 ++++++++++----------
 10 files changed, 31 insertions(+), 31 deletions(-)
---
diff --git a/beast-gtk/bstapp.cc b/beast-gtk/bstapp.cc
index f659a16..24097f8 100644
--- a/beast-gtk/bstapp.cc
+++ b/beast-gtk/bstapp.cc
@@ -1007,14 +1007,14 @@ app_action_exec (gpointer data,
           }
         for (i = 0; i < n_buckets; i++)
           {
-            g_printerr ("bucket[%u] = %u\n", i, buckets[i]);
+            printerr ("bucket[%u] = %u\n", i, buckets[i]);
             max = MAX (max, buckets[i]);
             min = MIN (min, buckets[i]);
             avg += buckets[i];
             if (!buckets[i])
               empty++;
           }
-        g_printerr ("n_objects: %u, minbucket=%u, maxbucket=%u, empty=%u, avg=%u\n",
+        printerr ("n_objects: %u, minbucket=%u, maxbucket=%u, empty=%u, avg=%u\n",
                     avg, min, max, empty, avg / n_buckets);
         g_slist_free (olist);
       }
diff --git a/beast-gtk/bstdbmeter.cc b/beast-gtk/bstdbmeter.cc
index cdc0d91..9d74bc7 100644
--- a/beast-gtk/bstdbmeter.cc
+++ b/beast-gtk/bstdbmeter.cc
@@ -1373,7 +1373,7 @@ db_scale_size_allocate (GtkRange      *range,
   tlength = CLAMP (tlength, 1, wlength);
   slider = CLAMP (slider, 1, tlength);
   if (0)        // GTKFIX: GtkRange should simply export the slide rectangle through a function call
-    g_printerr ("y=%d h=%d ty=%d th=%d trough-borders=%d slider=%d (start=%d)\n",
+    printerr ("y=%d h=%d ty=%d th=%d trough-borders=%d slider=%d (start=%d)\n",
                 woffset, wlength, toffset, tlength, range_trough_border, slider, range->slider_start);
   border = toffset + slider / 2;
   if (range_trough_border && range_trough_border + slider <= tlength / 2)
diff --git a/beast-gtk/bsteventrollctrl.cc b/beast-gtk/bsteventrollctrl.cc
index b7f174f..740fdf6 100644
--- a/beast-gtk/bsteventrollctrl.cc
+++ b/beast-gtk/bsteventrollctrl.cc
@@ -676,7 +676,7 @@ controller_canvas_drag (BstEventRollController *self,
     { BST_COMMON_ROLL_TOOL_SELECT,     select_start,           select_motion,  select_abort,   },
   };
 
-  // g_printerr ("canvas drag event, tick=%d (valid=%d) value=%f", drag->current_tick, drag->current_valid, 
drag->current_value);
+  // printerr ("canvas drag event, tick=%d (valid=%d) value=%f", drag->current_tick, drag->current_valid, 
drag->current_value);
 
   if (drag->type == GXK_DRAG_START)
     {
@@ -760,7 +760,7 @@ void
 controller_vpanel_drag (BstEventRollController *self,
                         BstEventRollDrag       *drag)
 {
-  // g_printerr ("vpanel drag event, tick=%d (valid=%d) value=%f", drag->current_tick, drag->current_valid, 
drag->current_value);
+  // printerr ("vpanel drag event, tick=%d (valid=%d) value=%f", drag->current_tick, drag->current_valid, 
drag->current_value);
 
   if (drag->type == GXK_DRAG_START ||
       drag->type == GXK_DRAG_MOTION)
diff --git a/beast-gtk/bstlogadjustment.cc b/beast-gtk/bstlogadjustment.cc
index 157d1f1..d577f00 100644
--- a/beast-gtk/bstlogadjustment.cc
+++ b/beast-gtk/bstlogadjustment.cc
@@ -171,7 +171,7 @@ ladj_adjust_ranges (BstLogAdjustment *ladj)
   if (0)
     {
       GtkAdjustment *client = ladj->client;
-      g_printerr ("ladj: client-changed: [%f %f] (%f %f %f) center: %g   CLIENT: [%f %f]\n",
+      printerr ("ladj: client-changed: [%f %f] (%f %f %f) center: %g   CLIENT: [%f %f]\n",
                   adj->lower, adj->upper,
                   adj->step_increment, adj->page_increment, adj->page_size,
                   ladj->center,
@@ -197,7 +197,7 @@ ladj_client_value_changed (BstLogAdjustment *ladj)
   adj->value = CLAMP (adj->value, adj->lower, adj->upper);
 
   if (0)
-    g_printerr ("ladj: client-value-changed: [%f %f] %g   CLIENT: [%f %f] %g\n",
+    printerr ("ladj: client-value-changed: [%f %f] %g   CLIENT: [%f %f] %g\n",
                 adj->lower, adj->upper, adj->value,
                 client->lower, client->upper, client->value);
 
diff --git a/beast-gtk/bstmain.cc b/beast-gtk/bstmain.cc
index 7fdc938..1442118 100644
--- a/beast-gtk/bstmain.cc
+++ b/beast-gtk/bstmain.cc
@@ -486,7 +486,7 @@ bst_args_parse_early (int *argc_p, char **argv)
       else if (strncmp (argv[i], "-:", 2) == 0)
        {
          const gchar *flags = argv[i] + 2;
-         g_printerr ("BEAST(%s): pid = %u\n", BST_VERSION, getpid ());
+         printerr ("BEAST(%s): pid = %u\n", BST_VERSION, getpid ());
          if (strchr (flags, 'N') != NULL)
            {
              register_core_plugins = FALSE;
diff --git a/beast-gtk/bstpianorollctrl.cc b/beast-gtk/bstpianorollctrl.cc
index 65a35e5..4161087 100644
--- a/beast-gtk/bstpianorollctrl.cc
+++ b/beast-gtk/bstpianorollctrl.cc
@@ -898,7 +898,7 @@ controller_piano_drag (BstPianoRollController *self,
   SfiProxy projectid = song ? bse_item_get_parent (song) : 0;
   SfiProxy track = song ? bse_song_find_track_for_part (song, part.proxy_id()) : 0;
 
-  // g_printerr ("piano drag event, note=%d (valid=%d)", drag->current_note, drag->current_valid);
+  // printerr ("piano drag event, note=%d (valid=%d)", drag->current_note, drag->current_valid);
 
   if (projectid && track)
     {
diff --git a/beast-gtk/gxk/gxklogadjustment.cc b/beast-gtk/gxk/gxklogadjustment.cc
index a62b817..6f3f2c2 100644
--- a/beast-gtk/gxk/gxklogadjustment.cc
+++ b/beast-gtk/gxk/gxklogadjustment.cc
@@ -106,7 +106,7 @@ adapter_adjustment_adjust_ranges (GxkAdapterAdjustment *self)
       if (0)
         {
           GtkAdjustment *client = self->client;
-          g_printerr ("Tadj(%p): range-changed: [%f %f] (%f %f %f), client(%p): [%f %f] (%f %f %f)\n",
+          printerr ("Tadj(%p): range-changed: [%f %f] (%f %f %f), client(%p): [%f %f] (%f %f %f)\n",
                       self, adj->lower, adj->upper, adj->step_increment, adj->page_increment, adj->page_size,
                       client, client->lower, client->upper, client->step_increment, client->page_increment, 
client->page_size);
         }
@@ -136,7 +136,7 @@ adapter_adjustment_client_value_changed (GxkAdapterAdjustment *self)
       adj->value = adapter_adjustment_convert (self, GXK_ADAPTER_ADJUSTMENT_CONVERT_FROM_CLIENT, 
client->value);
       adj->value = CLAMP (adj->value, adj->lower, adj->upper - adj->page_size);
       if (0)
-        g_printerr ("Tadj(%p): value-changed: [%f %f] %g client(%p): [%f %f] %g\n",
+        printerr ("Tadj(%p): value-changed: [%f %f] %g client(%p): [%f %f] %g\n",
                     self, adj->lower, adj->upper, adj->value,
                     client, client->lower, client->upper, client->value);
       if (!self->block_client)
@@ -406,7 +406,7 @@ log_adjustment_adjust_ranges (GxkLogAdjustment *self)
   if (0)
     {
       GtkAdjustment *client = self->client;
-      g_printerr ("ladj: client-changed: [%f %f] (%f %f %f) center: %g   CLIENT: [%f %f]\n",
+      printerr ("ladj: client-changed: [%f %f] (%f %f %f) center: %g   CLIENT: [%f %f]\n",
                   adj->lower, adj->upper,
                   adj->step_increment, adj->page_increment, adj->page_size,
                   self->center,
@@ -432,7 +432,7 @@ log_adjustment_client_value_changed (GxkLogAdjustment *self)
   adj->value = CLAMP (adj->value, adj->lower, adj->upper);
 
   if (0)
-    g_printerr ("ladj: client-value-changed: [%f %f] %g   CLIENT: [%f %f] %g\n",
+    printerr ("ladj: client-value-changed: [%f %f] %g   CLIENT: [%f %f] %g\n",
                 adj->lower, adj->upper, adj->value,
                 client->lower, client->upper, client->value);
 
diff --git a/beast-gtk/gxk/gxkparam.cc b/beast-gtk/gxk/gxkparam.cc
index 2d8ca55..bd0c211 100644
--- a/beast-gtk/gxk/gxkparam.cc
+++ b/beast-gtk/gxk/gxkparam.cc
@@ -642,7 +642,7 @@ param_score_editor (const GxkParamEditor *editor,
     }
 
   if (annotate)
-    g_printerr ("  %s(%s): fundamental=%s derived=%s%s%s editing=%s bonus=%+d%s%s: ",
+    printerr ("  %s(%s): fundamental=%s derived=%s%s%s editing=%s bonus=%+d%s%s: ",
                 editor->ident.name, editor->ident.nick,
                 g_type_name (editor->type_match.type),
                 editor->type_match.type_name ? editor->type_match.type_name : "<any>",
@@ -656,7 +656,7 @@ param_score_editor (const GxkParamEditor *editor,
   if (type_mismatch || option_mismatch) /* bail out on mismatches */
     {
       if (annotate)
-        g_printerr ("%s mismatch\n", type_mismatch ? "type" : "option");
+        printerr ("%s mismatch\n", type_mismatch ? "type" : "option");
       return 0;
     }
 
@@ -674,7 +674,7 @@ param_score_editor (const GxkParamEditor *editor,
   rating += bonus;      /* bonus is provided for overcomming additional mismatch possibilities */
 
   if (annotate)
-    g_printerr ("%d\n", rating);
+    printerr ("%d\n", rating);
   return rating;
 }
 
@@ -732,7 +732,7 @@ gxk_param_editor_debug_score (GParamSpec *pspec)
   GSList *slist;
   assert_return (G_IS_PARAM_SPEC (pspec));
   const gchar *options = g_param_spec_get_options (pspec);
-  g_printerr ("GxkParamEditor: rating for pspec: name=%s fundamental=%s type=%s options=%s nick=\"%s\" 
blurb=\"%s\"\n",
+  printerr ("GxkParamEditor: rating for pspec: name=%s fundamental=%s type=%s options=%s nick=\"%s\" 
blurb=\"%s\"\n",
               pspec->name,
               g_type_name (G_TYPE_FUNDAMENTAL (G_PARAM_SPEC_VALUE_TYPE (pspec))),
               g_type_name (G_PARAM_SPEC_VALUE_TYPE (pspec)),
diff --git a/beast-gtk/gxk/gxkradget.cc b/beast-gtk/gxk/gxkradget.cc
index 4d9fb13..3265a48 100644
--- a/beast-gtk/gxk/gxkradget.cc
+++ b/beast-gtk/gxk/gxkradget.cc
@@ -462,7 +462,7 @@ parse_formula (const gchar *c,
     }
   args = g_slist_prepend (args, g_strndup (last, c - last));
   if (!*c)
-    g_printerr ("malformed formula: $(%s\n", start);
+    printerr ("malformed formula: $(%s\n", start);
   else
     c++;        /* ')' */
   if (args)
@@ -1354,7 +1354,7 @@ radget_add_to_parent (GxkRadget    *parent,
                 }
             }
           else
-            g_printerr ("GXK: no such pack property: %s,%s,%s\n", G_OBJECT_TYPE_NAME (parent), 
G_OBJECT_TYPE_NAME (radget), pname);
+            printerr ("GXK: no such pack property: %s,%s,%s\n", G_OBJECT_TYPE_NAME (parent), 
G_OBJECT_TYPE_NAME (radget), pname);
         }
       gxk_radget_free_args (args);
     }
@@ -1405,7 +1405,7 @@ radget_apply_hooks (GxkRadget    *radget,
             }
         }
       else
-        g_printerr ("GXK: no such hook property: %s (radget=%s)\n", hname, G_OBJECT_TYPE_NAME (radget));
+        printerr ("GXK: no such hook property: %s (radget=%s)\n", hname, G_OBJECT_TYPE_NAME (radget));
     }
   /* cleanup */
   while (n_pops--)
@@ -2102,7 +2102,7 @@ gxk_radget_register_hook (GParamSpec   *pspec,
   assert_return (hook_func != NULL);
   if (find_hook (pspec->name, NULL))
     {
-      g_printerr ("GXK: not re-registering hook property: %s\n", pspec->name);
+      printerr ("GXK: not re-registering hook property: %s\n", pspec->name);
       return;
     }
   RadgetHook *hook = g_new0 (RadgetHook, 1);
diff --git a/beast-gtk/gxk/gxkspline.cc b/beast-gtk/gxk/gxkspline.cc
index 50f36dd..da04a9a 100644
--- a/beast-gtk/gxk/gxkspline.cc
+++ b/beast-gtk/gxk/gxkspline.cc
@@ -366,7 +366,7 @@ gxk_spline_findx (const GxkSpline *spline,
       static guint caller_sum, caller_times;
       caller_sum += iteration_counter;
       caller_times++;
-      g_printerr ("spline_findx: iters=%u (avg=%f) x=%.17g y=%.17g approx=%.17g dx=%.17g dy=%.17g\n",
+      printerr ("spline_findx: iters=%u (avg=%f) x=%.17g y=%.17g approx=%.17g dx=%.17g dy=%.17g\n",
                   iteration_counter, caller_sum / (double) caller_times, x, y, z, xmax-xmin, z-y);
     }
   return x;
@@ -392,38 +392,38 @@ gxk_spline_free (GxkSpline *spline)
 void
 gxk_spline_dump (GxkSpline *spline)
 {
-  g_printerr ("GxkSpline[%u] = {\n", spline->n_segs);
-  g_printerr ("  // x, y, yd2, ymin, ymax, ex1, ex2\n");
+  printerr ("GxkSpline[%u] = {\n", spline->n_segs);
+  printerr ("  // x, y, yd2, ymin, ymax, ex1, ex2\n");
   guint i;
   for (i = 0; i < spline->n_segs; i++)
     {
       GxkSplineSegment *seg = spline->segs + i;
-      g_printerr ("  { %-+.17g, %-+.17g, %-+.17g, %-+.17g, %-+.17g, %-+.17g, %-+.17g },",
+      printerr ("  { %-+.17g, %-+.17g, %-+.17g, %-+.17g, %-+.17g, %-+.17g, %-+.17g },",
                   seg->x, seg->y, seg->yd2, seg->ymin, seg->ymax, seg->ex1, seg->ex2);
       const double test_epsilon = 0.0000001;
       if (isfinite (seg->ex1))
         {
-          g_printerr ("\n    ");
+          printerr ("\n    ");
           double s1 = gxk_spline_y (spline, seg->ex1 - test_epsilon);
           double s2 = gxk_spline_y (spline, seg->ex1);
           double s3 = gxk_spline_y (spline, seg->ex1 - test_epsilon);
           const char *judge = (s2 - s1) * (s2 - s3) < 0 ? "FAIL" : "OK";
           if (s2 - s1 == 0 || s2 - s3 == 0)
             judge = "BROKEN";   /* test_epsilon too small */
-          g_printerr ("// extremum%u check: %s", 1, judge);
+          printerr ("// extremum%u check: %s", 1, judge);
         }
       if (isfinite (seg->ex2))
         {
-          g_printerr ("\n    ");
+          printerr ("\n    ");
           double s1 = gxk_spline_y (spline, seg->ex2 - test_epsilon);
           double s2 = gxk_spline_y (spline, seg->ex2);
           double s3 = gxk_spline_y (spline, seg->ex2 - test_epsilon);
           const char *judge = (s2 - s1) * (s2 - s3) < 0 ? "FAIL" : "OK";
           if (s2 - s1 == 0 || s2 - s3 == 0)
             judge = "BROKEN";   /* test_epsilon too small */
-          g_printerr ("// extremum%u check: %s", 2, judge);
+          printerr ("// extremum%u check: %s", 2, judge);
         }
-      g_printerr ("\n");
+      printerr ("\n");
     }
-  g_printerr ("};\n");
+  printerr ("};\n");
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]