GNOME.org
 

[beast: 2/12] BSE: rename ic0n and p1xel to make room for new API

commit 278a18ed02d01b3f3be2a82b74617d26741b2085
Author: Tim Janik <timj gnu org>
Date:   Fri Sep 18 10:36:41 2015 +0200

    BSE: rename ic0n and p1xel to make room for new API

 bse/bsebasics.idl      |    8 ++++----
 bse/bsecategories.cc   |    8 ++++----
 bse/bseengine.cc       |    2 +-
 bse/bseenginemaster.cc |    2 +-
 bse/bseenginenode.hh   |    2 +-
 bse/bseitem.proc       |    2 +-
 bse/bseobject.cc       |   20 ++++++++++----------
 bse/bseobject.hh       |    4 ++--
 bse/bseutils.cc        |   16 ++++++++--------
 bse/bseutils.hh        |    2 +-
 10 files changed, 33 insertions(+), 33 deletions(-)
---
diff --git a/bse/bsebasics.idl b/bse/bsebasics.idl
index b6f3d17..f0f0dce 100644
--- a/bse/bsebasics.idl
+++ b/bse/bsebasics.idl
@@ -360,15 +360,15 @@ record NoteSequence
   Int     offset = Note ("Note Offset", "Center/base note", KAMMER_NOTE, ":readwrite");
   NoteSeq notes  = SfiSeq ("Notes", "Sequence of notes", ":readwrite");
 };
-sequence PixelSeq {
+sequence P1xelSeq {
   Int  pixels;
 };
-record Icon
+record Ic0n
 {
   Info     blurb     = "BSE icon representation.";
   Int      width     = SfiInt ("Width", "Width in pixels or 0 for no icon", 0, 0, MAXINT, 1, ":readwrite");
   Int      height    = SfiInt ("Height", "Height in pixels or 0 for no icon", 0, 0, MAXINT, 1, ":readwrite");
-  PixelSeq pixel_seq = SfiSeq ("Pixels", "Pixel array of width*height ARGB pixels", ":readwrite");
+  P1xelSeq pixel_seq = SfiSeq ("Pixels", "Pixel array of width*height ARGB pixels", ":readwrite");
 };
 record Category
 {
@@ -377,7 +377,7 @@ record Category
   Int    mindex;
   Int    lindex;
   SfiString type;
-  Icon   icon;
+  Ic0n   icon;
 };
 sequence CategorySeq {
   Category cats;
diff --git a/bse/bsecategories.cc b/bse/bsecategories.cc
index 5d68531..a8dbaa7 100644
--- a/bse/bsecategories.cc
+++ b/bse/bsecategories.cc
@@ -18,7 +18,7 @@ struct _CEntry
   GQuark   category;
   guint    mindex, lindex;
   GType    type;
-  BseIcon *icon;
+  BseIc0n *icon;
 };
 
 
@@ -188,7 +188,7 @@ bse_categories_register (const gchar  *category,
     {
       centry->type = type;
       if (pixstream)
-        centry->icon = bse_icon_from_pixstream (pixstream);
+        centry->icon = bse_ic0n_from_pixstream (pixstream);
       else
         centry->icon = NULL;
     }
@@ -340,8 +340,8 @@ bse_category_from_id (guint id)
       g_free (cat->type);
       cat->type = g_strdup (g_type_name (centry->type));
       if (cat->icon)
-        bse_icon_free (cat->icon);
-      cat->icon = centry->icon ? bse_icon_copy_shallow (centry->icon) : NULL;
+        bse_ic0n_free (cat->icon);
+      cat->icon = centry->icon ? bse_ic0n_copy_shallow (centry->icon) : NULL;
       return cat;
     }
   return NULL;
diff --git a/bse/bseengine.cc b/bse/bseengine.cc
index e237002..6ef053d 100644
--- a/bse/bseengine.cc
+++ b/bse/bseengine.cc
@@ -247,7 +247,7 @@ bse_job_connect (BseModule *src_module,
   g_return_val_if_fail (dest_istream < dest_module->klass->n_istreams, NULL);
 
   job = sfi_new_struct0 (BseJob, 1);
-  job->job_id = ENGINE_JOB_ICONNECT;
+  job->job_id = ENGINE_JOB_IC0NNECT;
   job->connection.dest_node = ENGINE_NODE (dest_module);
   job->connection.dest_ijstream = dest_istream;
   job->connection.src_node = ENGINE_NODE (src_module);
diff --git a/bse/bseenginemaster.cc b/bse/bseenginemaster.cc
index d18f9be..c200994 100644
--- a/bse/bseenginemaster.cc
+++ b/bse/bseenginemaster.cc
@@ -429,7 +429,7 @@ master_process_job (BseJob *job)
          master_need_reflow |= TRUE;
        }
       break;
-    case ENGINE_JOB_ICONNECT:
+    case ENGINE_JOB_IC0NNECT:
       node = job->connection.dest_node;
       src_node = job->connection.src_node;
       istream = job->connection.dest_ijstream;
diff --git a/bse/bseenginenode.hh b/bse/bseenginenode.hh
index 95ef689..9a644f5 100644
--- a/bse/bseenginenode.hh
+++ b/bse/bseenginenode.hh
@@ -37,7 +37,7 @@ typedef enum /*< skip >*/
   ENGINE_JOB_SYNC,
   ENGINE_JOB_INTEGRATE,
   ENGINE_JOB_DISCARD,
-  ENGINE_JOB_ICONNECT,
+  ENGINE_JOB_IC0NNECT,
   ENGINE_JOB_JCONNECT,
   ENGINE_JOB_IDISCONNECT,
   ENGINE_JOB_JDISCONNECT,
diff --git a/bse/bseitem.proc b/bse/bseitem.proc
index 2ad653d..ed60acd 100644
--- a/bse/bseitem.proc
+++ b/bse/bseitem.proc
@@ -473,7 +473,7 @@ METHOD (BseItem, get-icon) {
   IN   = bse_param_spec_object ("item", NULL, NULL,
                                 BSE_TYPE_ITEM, SFI_PARAM_STANDARD);
   OUT  = bse_param_spec_boxed ("icon", NULL, NULL,
-                               BSE_TYPE_ICON, SFI_PARAM_STANDARD);
+                               BSE_TYPE_IC0N, SFI_PARAM_STANDARD);
 } BODY (BseProcedureClass *proc,
        const GValue      *in_values,
        GValue            *out_values)
diff --git a/bse/bseobject.cc b/bse/bseobject.cc
index 4016ffe..ad91f73 100644
--- a/bse/bseobject.cc
+++ b/bse/bseobject.cc
@@ -54,7 +54,7 @@ enum
 enum
 {
   SIGNAL_RELEASE,
-  SIGNAL_ICON_CHANGED,
+  SIGNAL_IC0N_CHANGED,
   SIGNAL_LAST
 };
 
@@ -569,13 +569,13 @@ bse_object_notify_icon_changed (BseObject *object)
 {
   g_return_if_fail (BSE_IS_OBJECT (object));
 
-  g_signal_emit (object, object_signals[SIGNAL_ICON_CHANGED], 0);
+  g_signal_emit (object, object_signals[SIGNAL_IC0N_CHANGED], 0);
 }
 
-BseIcon*
+BseIc0n*
 bse_object_get_icon (BseObject *object)
 {
-  BseIcon *icon;
+  BseIc0n *icon;
 
   g_return_val_if_fail (BSE_IS_OBJECT (object), NULL);
 
@@ -588,14 +588,14 @@ bse_object_get_icon (BseObject *object)
   return icon;
 }
 
-static BseIcon*
+static BseIc0n*
 bse_object_do_get_icon (BseObject *object)
 {
-  BseIcon *icon;
+  BseIc0n *icon;
 
   g_return_val_if_fail (BSE_IS_OBJECT (object), NULL);
 
-  icon = (BseIcon*) g_object_get_qdata (G_OBJECT (object), bse_quark_icon);
+  icon = (BseIc0n*) g_object_get_qdata (G_OBJECT (object), bse_quark_icon);
   if (!icon)
     {
       BseCategorySeq *cseq;
@@ -608,8 +608,8 @@ bse_object_do_get_icon (BseObject *object)
       for (i = 0; i < cseq->n_cats; i++)
        if (cseq->cats[i]->icon)
          {
-           icon = bse_icon_copy_shallow (cseq->cats[i]->icon);
-           g_object_set_qdata_full (G_OBJECT (object), bse_quark_icon, icon, (GDestroyNotify) bse_icon_free);
+           icon = bse_ic0n_copy_shallow (cseq->cats[i]->icon);
+           g_object_set_qdata_full (G_OBJECT (object), bse_quark_icon, icon, (GDestroyNotify) bse_ic0n_free);
            break;
          }
       bse_category_seq_free (cseq);
@@ -876,7 +876,7 @@ bse_object_class_init (BseObjectClass *klass)
 
   object_signals[SIGNAL_RELEASE] = bse_object_class_add_signal (klass, "release",
                                                                G_TYPE_NONE, 0);
-  object_signals[SIGNAL_ICON_CHANGED] = bse_object_class_add_signal (klass, "icon_changed",
+  object_signals[SIGNAL_IC0N_CHANGED] = bse_object_class_add_signal (klass, "icon_changed",
                                                                     G_TYPE_NONE, 0);
 }
 
diff --git a/bse/bseobject.hh b/bse/bseobject.hh
index 1806cf9..600f2fb 100644
--- a/bse/bseobject.hh
+++ b/bse/bseobject.hh
@@ -111,7 +111,7 @@ struct BseObjectClass : GObjectClass {
                                                  guint            vminor,
                                                  guint            vmicro);
   void                 (*unlocked)             (BseObject      *object);
-  BseIcon*             (*get_icon)             (BseObject      *object);
+  BseIc0n*             (*get_icon)             (BseObject      *object);
 };
 
 /* --- object class API ---*/
@@ -147,7 +147,7 @@ void                bse_object_lock                 (gpointer        object);
 void           bse_object_unlock               (gpointer        object);
 gboolean        bse_object_editable_property   (gpointer        object,
                                                  const gchar    *property);
-BseIcon*       bse_object_get_icon             (BseObject      *object);
+BseIc0n*       bse_object_get_icon             (BseObject      *object);
 void           bse_object_notify_icon_changed  (BseObject      *object);
 BseObject*     bse_object_from_id              (guint           unique_id);
 GList*         bse_objects_list                (GType           type);
diff --git a/bse/bseutils.cc b/bse/bseutils.cc
index bd1168a..3316b31 100644
--- a/bse/bseutils.cc
+++ b/bse/bseutils.cc
@@ -228,10 +228,10 @@ typedef struct
   guint          height : 12;
   const guint8  *encoded_pix_data;
 } BsePixdata;
-static BseIcon*
-bse_icon_from_pixdata (const BsePixdata *pixdata)
+static BseIc0n*
+bse_ic0n_from_pixdata (const BsePixdata *pixdata)
 {
-  BseIcon *icon;
+  BseIc0n *icon;
   guint bpp, encoding;
 
   g_return_val_if_fail (pixdata != NULL, NULL);
@@ -254,10 +254,10 @@ bse_icon_from_pixdata (const BsePixdata *pixdata)
     }
   if (!pixdata->encoded_pix_data)
     return NULL;
-  icon = bse_icon_new ();
+  icon = bse_ic0n_new ();
   icon->width = pixdata->width;
   icon->height = pixdata->height;
-  bse_pixel_seq_resize (icon->pixel_seq, icon->width * icon->height);
+  bse_p1xel_seq_resize (icon->pixel_seq, icon->width * icon->height);
   guint8 *image_buffer = (guint8*) icon->pixel_seq->pixels;
   if (encoding == BSE_PIXDATA_1BYTE_RLE)
     {
@@ -319,8 +319,8 @@ get_uint32 (const guint8 *stream, guint *result)
   *result = (stream[0] << 24) + (stream[1] << 16) + (stream[2] << 8) + stream[3];
   return stream + 4;
 }
-BseIcon*
-bse_icon_from_pixstream (const guint8 *pixstream)
+BseIc0n*
+bse_ic0n_from_pixstream (const guint8 *pixstream)
 {
   BsePixdata pixd;
   const guint8 *s = pixstream;
@@ -345,7 +345,7 @@ bse_icon_from_pixstream (const guint8 *pixstream)
   pixd.width = width;
   pixd.height = height;
   pixd.encoded_pix_data = s;
-  return bse_icon_from_pixdata (&pixd);
+  return bse_ic0n_from_pixdata (&pixd);
 }
 /* --- ID allocator --- */
 #define        ID_WITHHOLD_BUFFER_SIZE         59
diff --git a/bse/bseutils.hh b/bse/bseutils.hh
index 1b1f0f2..988d44f 100644
--- a/bse/bseutils.hh
+++ b/bse/bseutils.hh
@@ -48,7 +48,7 @@ void    bse_balance_set         (double  balance,
 
 
 /* --- icons --- */
-BseIcon* bse_icon_from_pixstream (const guint8     *pixstream);
+BseIc0n* bse_ic0n_from_pixstream (const guint8     *pixstream);
 
 
 /* --- ID allocator --- */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]