GNOME.org
 

[beast: 8/12] BST: adjust to use new Bse::Item methods

commit 4ddf135af7a96cae9016ea889a2d59bd3bcb6bbd
Author: Tim Janik <timj gnu org>
Date:   Sun Sep 24 03:59:25 2017 +0200

    BST: adjust to use new Bse::Item methods
    
    Signed-off-by: Tim Janik <timj gnu org>

 beast-gtk/bstapp.cc           |    4 ++--
 beast-gtk/bstcanvassource.cc  |    4 ++--
 beast-gtk/bstitemview.cc      |    2 +-
 beast-gtk/bstparam.cc         |    2 +-
 beast-gtk/bstpianoroll.cc     |    4 ++--
 beast-gtk/bsttrackroll.cc     |    4 ++--
 beast-gtk/bsttrackrollctrl.cc |    2 +-
 beast-gtk/bsttrackview.cc     |   15 ++++++++-------
 beast-gtk/bstusermessage.cc   |    4 ++--
 beast-gtk/bstwaveeditor.cc    |   10 +++++-----
 10 files changed, 26 insertions(+), 25 deletions(-)
---
diff --git a/beast-gtk/bstapp.cc b/beast-gtk/bstapp.cc
index 0d47ff0..163ee71 100644
--- a/beast-gtk/bstapp.cc
+++ b/beast-gtk/bstapp.cc
@@ -463,7 +463,7 @@ ppage_item_free (gpointer user_data,
   bse_proxy_disconnect (item, "any-signal::property-notify::uname", app_update_page_item, self, NULL);
   if (GTK_IS_WIDGET (object))
     gtk_widget_destroy (GTK_WIDGET (object));
-  bse_item_unuse (item);
+  Bse::ItemH::down_cast (bse_server.from_proxy (item)).unuse();
 }
 
 static void
@@ -472,7 +472,7 @@ bst_app_add_page_item (BstApp *self, uint position, SfiProxy itemid)
   Bse::ItemH item = Bse::ItemH::down_cast (bse_server.from_proxy (itemid));
   const gchar *stock;
   String name = item.get_name_or_type();
-  bse_item_use (itemid);
+  item.use();
   bse_proxy_connect (itemid, "signal::property-notify::uname", app_update_page_item, self, NULL);
   String tip;
   if (BSE_IS_WAVE_REPO (itemid))
diff --git a/beast-gtk/bstcanvassource.cc b/beast-gtk/bstcanvassource.cc
index 996d393..4118448 100644
--- a/beast-gtk/bstcanvassource.cc
+++ b/beast-gtk/bstcanvassource.cc
@@ -209,7 +209,7 @@ bst_canvas_source_destroy (GtkObject *object)
                            "any_signal", source_pos_changed, csource,
                            "any_signal", source_icon_changed, csource,
                            NULL);
-      bse_item_unuse (csource->source.proxy_id());
+      csource->source.unuse();
       csource->source = Bse::SourceH();
     }
 
@@ -234,7 +234,7 @@ bst_canvas_source_new (GnomeCanvasGroup *group,
   csource = BST_CANVAS_SOURCE (item);
   csource->source = Bse::SourceH::down_cast (bse_server.from_proxy (source));
   if (csource->source)
-    bse_item_use (csource->source.proxy_id());
+    csource->source.use();
   bse_proxy_connect (csource->source.proxy_id(),
                     "swapped_signal::release", gtk_object_destroy, csource,
                     "swapped_signal::io_changed", source_channels_changed, csource,
diff --git a/beast-gtk/bstitemview.cc b/beast-gtk/bstitemview.cc
index bb3cded..1832760 100644
--- a/beast-gtk/bstitemview.cc
+++ b/beast-gtk/bstitemview.cc
@@ -86,7 +86,7 @@ bst_item_view_name_edited (BstItemView *self,
       gint row = gxk_tree_spath_index0 (strpath);
       SfiProxy item = bst_item_view_get_proxy (self, row);
       if (item)
-       bse_item_set_name (item, text);
+        Bse::ItemH::down_cast (bse_server.from_proxy (item)).set_name (text);
     }
 }
 
diff --git a/beast-gtk/bstparam.cc b/beast-gtk/bstparam.cc
index b73ba40..60e2840 100644
--- a/beast-gtk/bstparam.cc
+++ b/beast-gtk/bstparam.cc
@@ -275,7 +275,7 @@ proxy_binding_check_writable (GxkParam *param)
 {
   SfiProxy proxy = param->bdata[0].v_long;
   if (proxy)
-    return bse_item_editable_property (proxy, param->pspec->name);
+    return Bse::ItemH::down_cast (bse_server.from_proxy (proxy)).editable_property (param->pspec->name);
   else
     return FALSE;
 }
diff --git a/beast-gtk/bstpianoroll.cc b/beast-gtk/bstpianoroll.cc
index 43f732c..d4ac780 100644
--- a/beast-gtk/bstpianoroll.cc
+++ b/beast-gtk/bstpianoroll.cc
@@ -1208,7 +1208,7 @@ bst_piano_roll_set_part (BstPianoRoll *self, Bse::PartH part)
                                 "any_signal", piano_roll_release_proxy, self,
                                 "any_signal", piano_roll_song_pointer_changed, self,
                                 NULL);
-          bse_item_unuse (self->song);
+          Bse::ItemH::down_cast (bse_server.from_proxy (self->song)).unuse();
           self->song = 0;
         }
       self->plinks.clear();
@@ -1236,7 +1236,7 @@ bst_piano_roll_set_part (BstPianoRoll *self, Bse::PartH part)
       if (song)
         {
           self->song = song;
-          bse_item_use (self->song);
+          Bse::ItemH::down_cast (bse_server.from_proxy (self->song)).use();
           bse_proxy_connect (self->song,
                              "swapped_signal::release", piano_roll_release_proxy, self,
                              "swapped_signal::pointer-changed", piano_roll_song_pointer_changed, self,
diff --git a/beast-gtk/bsttrackroll.cc b/beast-gtk/bsttrackroll.cc
index 9325c9f..f0787c8 100644
--- a/beast-gtk/bsttrackroll.cc
+++ b/beast-gtk/bsttrackroll.cc
@@ -181,7 +181,7 @@ track_roll_release_proxy (BstTrackRoll *self)
                         "any_signal", track_roll_release_proxy, self,
                         "any_signal", track_roll_song_item_removed, self,
                         NULL);
-  bse_item_unuse (self->proxy);
+  Bse::ItemH::down_cast (bse_server.from_proxy (self->proxy)).unuse();
   self->proxy = 0;
 }
 
@@ -215,7 +215,7 @@ bst_track_roll_setup (BstTrackRoll   *self,
   self->proxy = song;
   if (self->proxy)
     {
-      bse_item_use (self->proxy);
+      Bse::ItemH::down_cast (bse_server.from_proxy (self->proxy)).use();
       bse_proxy_connect (self->proxy,
                          "swapped_signal::release", track_roll_release_proxy, self,
                          "swapped_signal::item-remove", track_roll_song_item_removed, self,
diff --git a/beast-gtk/bsttrackrollctrl.cc b/beast-gtk/bsttrackrollctrl.cc
index 8a7868e..6b53f66 100644
--- a/beast-gtk/bsttrackrollctrl.cc
+++ b/beast-gtk/bsttrackrollctrl.cc
@@ -406,7 +406,7 @@ controller_stop_edit (BstTrackRollController *self,
 {
   if (!canceled)
     {
-      bse_item_set_name (self->obj_part.proxy_id(), gtk_entry_get_text (GTK_ENTRY (ecell)));
+      self->obj_part.set_name (gtk_entry_get_text (GTK_ENTRY (ecell)));
       gxk_status_set (GXK_STATUS_DONE, _("Edit Part"), NULL);
     }
   controller_reset_canvas_cursor (self);
diff --git a/beast-gtk/bsttrackview.cc b/beast-gtk/bsttrackview.cc
index 539e683..7816f74 100644
--- a/beast-gtk/bsttrackview.cc
+++ b/beast-gtk/bsttrackview.cc
@@ -308,11 +308,11 @@ track_view_synth_popup (BstTrackView         *self,
     {
       gint row = gxk_tree_spath_index0 (strpath);
       SfiProxy itemid = bst_item_view_get_proxy (BST_ITEM_VIEW (self), row);
-      if (bse_item_editable_property (itemid, "snet"))
+      Bse::ItemH item = Bse::ItemH::down_cast (bse_server.from_proxy (itemid));
+      if (item.editable_property ("snet"))
         {
           BsePropertyCandidates *pc = bse_item_get_property_candidates (itemid, "snet");
           SynthPopup sdata = { self, pcell, };
-          Bse::ItemH item = Bse::ItemH::down_cast (bse_server.from_proxy (itemid));
           Bse::ProjectH project = item.get_project();
           GtkWidget *dialog = bst_track_synth_dialog_popup (self, itemid,
                                                             pc->label, pc->tooltip, pc->items,
@@ -341,12 +341,13 @@ track_view_post_synth_popup (BstTrackView         *self,
   if (strpath)
     {
       gint row = gxk_tree_spath_index0 (strpath);
-      SfiProxy item = bst_item_view_get_proxy (BST_ITEM_VIEW (self), row);
-      if (bse_item_editable_property (item, "pnet"))
+      SfiProxy itemid = bst_item_view_get_proxy (BST_ITEM_VIEW (self), row);
+      Bse::ItemH item = Bse::ItemH::down_cast (bse_server.from_proxy (itemid));
+      if (item.editable_property ("pnet"))
         {
-          BsePropertyCandidates *pc = bse_item_get_property_candidates (item, "pnet");
+          BsePropertyCandidates *pc = bse_item_get_property_candidates (itemid, "pnet");
           SynthPopup sdata = { self, pcell, };
-          GtkWidget *dialog = bst_track_synth_dialog_popup (self, item,
+          GtkWidget *dialog = bst_track_synth_dialog_popup (self, itemid,
                                                             pc->label, pc->tooltip, pc->items,
                                                             NULL, NULL, 0,
                                                            NULL, NULL, 0,
@@ -759,7 +760,7 @@ track_view_action_exec (gpointer data,
       if (track)
        {
          gchar *string = g_strdup_format ("Track-%02X", track.get_seqid());
-         bse_item_set_name (track.proxy_id(), string);
+         track.set_name (string);
          g_free (string);
          bst_item_view_select (item_view, track.proxy_id());
           track.ensure_output();
diff --git a/beast-gtk/bstusermessage.cc b/beast-gtk/bstusermessage.cc
index b6857a0..b0ca511 100644
--- a/beast-gtk/bstusermessage.cc
+++ b/beast-gtk/bstusermessage.cc
@@ -589,7 +589,7 @@ janitor_window_deleted (GxkDialog *dialog)
                        "any_signal", janitor_unconnected, dialog,
                        NULL);
   // bse_janitor_kill (janitor);
-  bse_item_unuse (janitor);
+  Bse::ItemH::down_cast (bse_server.from_proxy (janitor)).unuse();
 }
 
 static GtkWidget*
@@ -608,7 +608,7 @@ create_janitor_dialog (SfiProxy janitor)
                     "swapped-object-signal::property-notify::connected", janitor_unconnected, dialog,
                     NULL);
   janitor_actions_changed (dialog);
-  bse_item_use (janitor);
+  Bse::ItemH::down_cast (bse_server.from_proxy (janitor)).use();
   g_object_connect (dialog, "swapped_signal::destroy", janitor_window_deleted, dialog, NULL);
   dialog_show_above_modals (dialog, FALSE);
   return GTK_WIDGET (dialog);
diff --git a/beast-gtk/bstwaveeditor.cc b/beast-gtk/bstwaveeditor.cc
index 2410ff1..3f8024c 100644
--- a/beast-gtk/bstwaveeditor.cc
+++ b/beast-gtk/bstwaveeditor.cc
@@ -293,7 +293,7 @@ bst_wave_editor_set_wave (BstWaveEditor *self,
     {
       if (self->wave)
        {
-         bse_item_unuse (self->wave);
+          Bse::ItemH::down_cast (bse_server.from_proxy (self->wave)).unuse();
          gxk_list_wrapper_notify_clear (self->chunk_wrapper);
        }
       bst_wave_editor_unset_esample (self);
@@ -303,7 +303,7 @@ bst_wave_editor_set_wave (BstWaveEditor *self,
        self->wave = 0;
       if (self->wave)
        {
-         bse_item_use (self->wave);
+          Bse::ItemH::down_cast (bse_server.from_proxy (self->wave)).use();
           Bse::WaveH wave = Bse::WaveH::down_cast (bse_server.from_proxy (self->wave));
          /* add wave's chunks to list */
          gxk_list_wrapper_notify_prepend (self->chunk_wrapper, wave.n_wave_chunks());
@@ -527,12 +527,12 @@ bst_wave_editor_set_esample (BstWaveEditor *self, Bse::EditableSampleH esample)
        {
          if (self->esample_open)
            self->esample.close();
-          bse_item_unuse (self->esample.proxy_id()); // FIXME: Item.use_count is only needed to keep a 
container's children
+          self->esample.unuse(); // FIXME: Item.use_count is only needed to keep a container's children
        }
       self->esample = esample;
       if (self->esample)
        {
-          bse_item_use (self->esample.proxy_id()); // FIXME: Item.use_count is only needed to keep a 
container's children
+          self->esample.use(); // FIXME: Item.use_count is only needed to keep a container's children
          Bse::Error error;
          error = self->esample.open();
          self->esample_open = error == Bse::Error::NONE;
@@ -587,7 +587,7 @@ tree_selection_changed (BstWaveEditor    *self,
       Bse::WaveH wave = Bse::WaveH::down_cast (bse_server.from_proxy (self->wave));
       Bse::EditableSampleHandle esample = wave.use_editable (gxk_list_wrapper_get_index 
(self->chunk_wrapper, &iter));
       bst_wave_editor_set_esample (self, esample);
-      bse_item_unuse (esample.proxy_id()); // FIXME: change use_editable()
+      esample.unuse(); // FIXME: change use_editable()
     }
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]