[beast: 5/15] BSE: remove unused parasite code



commit 020df5e1735702157b361a6e0bc10f0cd2ac2d64
Author: Tim Janik <timj gnu org>
Date:   Fri Sep 25 09:19:32 2015 +0200

    BSE: remove unused parasite code

 bse/Makefile.am      |    6 +-
 bse/bsedefs.hh       |    1 -
 bse/bseitem.cc       |    5 -
 bse/bseitem.hh       |    5 +-
 bse/bseitem.proc     |    1 -
 bse/bseobject.cc     |    1 -
 bse/bseparasite.cc   |  709 --------------------------------------------------
 bse/bseparasite.hh   |   46 ----
 bse/bseparasite.proc |   91 -------
 bse/bsestorage.cc    |    4 -
 10 files changed, 5 insertions(+), 864 deletions(-)
---
diff --git a/bse/Makefile.am b/bse/Makefile.am
index f7204ad..e73217b 100644
--- a/bse/Makefile.am
+++ b/bse/Makefile.am
@@ -40,7 +40,7 @@ bse_public_headers = $(strip \
        bsemidicontroller.hh    bsemididevice.hh                bsedevice.hh                    \
        bsemididevice-null.hh   bsemididevice-oss.hh    bsemidievent.hh                 bsemidinotifier.hh \
        bsemidireceiver.hh      bsemidisynth.hh         bseobject.hh                    bsepart.hh \
-       bsepcminput.hh          bsepcmoutput.hh         bseparam.hh                     bseparasite.hh \
+       bsepcminput.hh          bsepcmoutput.hh         bseparam.hh                     \
        bsepcmdevice.hh         bsepcmdevice-oss.hh     bsepcmdevice-null.hh            bseplugin.hh \
        bseprocedure.hh         bseproject.hh           bsescripthelper.hh              bseserver.hh \
        bsesnet.hh              bsesnooper.hh           bsesong.hh                      bsesequencer.hh \
@@ -74,7 +74,7 @@ bse_sources = $(strip \
        bsemidicontroller.cc    bsemididevice.cc        bsedevice.cc                    \
        bsemididevice-null.cc   bsemididevice-oss.cc    bsemidievent.cc                 bsemidinotifier.cc \
        bsemidireceiver.cc      bsemidisynth.cc         bseobject.cc                    bsepart.cc \
-       bsepcminput.cc          bsepcmoutput.cc         bseparam.cc                     bseparasite.cc \
+       bsepcminput.cc          bsepcmoutput.cc         bseparam.cc                     \
        bsepcmdevice.cc         bsepcmdevice-oss.cc     bsepcmdevice-null.cc            bseplugin.cc \
        bseprocedure.cc         bseproject.cc           bsescripthelper.cc              bseserver.cc \
        bsesnet.cc              bsesnooper.cc           bsesong.cc                      bsesequencer.cc \
@@ -116,7 +116,7 @@ idl_dummy_files = $(strip   \
 # BSE procedure sources
 bse_proc_sources = $(strip \
        bsecategories.proc      bsecontainer.proc       bsedatapocket.proc      bseeditablesample.proc  \
-       bsejanitor.proc                                 bseparasite.proc        bseprocedure.proc       
bseproject.proc \
+       bsejanitor.proc                                 bseprocedure.proc       bseproject.proc         \
                                bsesong.proc                                    bsesource.proc          \
        bsetrack.proc           bseitem.proc            bsewave.proc            bsewaveosc.proc         
bsewaverepo.proc \
 )
diff --git a/bse/bsedefs.hh b/bse/bsedefs.hh
index d5da519..db7e2fd 100644
--- a/bse/bsedefs.hh
+++ b/bse/bsedefs.hh
@@ -48,7 +48,6 @@ struct BseMidiSynthClass;
 struct BseMidiContext;
 struct BseObject;
 struct BseObjectClass;
-struct BseParasite;
 struct BsePart;
 struct BsePartClass;
 struct BsePcmWriter;
diff --git a/bse/bseitem.cc b/bse/bseitem.cc
index 00c195c..eb0fa5a 100644
--- a/bse/bseitem.cc
+++ b/bse/bseitem.cc
@@ -5,7 +5,6 @@
 #include "bsestorage.hh"
 #include "bseprocedure.hh"
 #include "bsemain.hh"
-#include "bseparasite.hh"
 #include "bseproject.hh"
 #include "bsesong.hh" // for song->musical_tuning
 #include "bseundostack.hh"
@@ -110,7 +109,6 @@ bse_item_class_init (BseItemClass *klass)
                               PROP_SEQID,
                               sfi_pspec_int ("seqid", "Sequential ID", NULL,
                                              0, 0, SFI_MAXINT, 1, "r"));
-  bse_item_class_add_parasite_signals (klass);
 }
 
 static void
@@ -161,8 +159,6 @@ bse_item_do_dispose (GObject *gobject)
   if (item->parent)
     bse_container_remove_item (BSE_CONTAINER (item->parent), item);
 
-  bse_item_delete_parasites (item);
-
   /* chain parent class' handler */
   G_OBJECT_CLASS (parent_class)->dispose (gobject);
 }
@@ -172,7 +168,6 @@ bse_item_do_finalize (GObject *object)
 {
   BseItem *item = BSE_ITEM (object);
 
-  bse_item_delete_parasites (item);
   item_seqid_changed_queue = g_slist_remove (item_seqid_changed_queue, item);
 
   /* chain parent class' handler */
diff --git a/bse/bseitem.hh b/bse/bseitem.hh
index f874d39..8a2f38a 100644
--- a/bse/bseitem.hh
+++ b/bse/bseitem.hh
@@ -2,8 +2,8 @@
 #ifndef __BSE_ITEM_H__
 #define __BSE_ITEM_H__
 
-#include        <bse/bseobject.hh>
-#include        <bse/bseundostack.hh>
+#include <bse/bseobject.hh>
+#include <bse/bseundostack.hh>
 
 G_BEGIN_DECLS
 
@@ -34,7 +34,6 @@ typedef enum                            /*< skip >*/
 struct BseItem : BseObject {
   guint         use_count;
   BseItem      *parent;
-  BseParasite  *parasite;
 };
 
 struct BseItemClass : BseObjectClass {
diff --git a/bse/bseitem.proc b/bse/bseitem.proc
index 3b83fa2..2a843d2 100644
--- a/bse/bseitem.proc
+++ b/bse/bseitem.proc
@@ -5,7 +5,6 @@
 #include <bse/bsecontainer.hh>
 #include <bse/bseundostack.hh>
 #include <bse/bseproject.hh>
-#include <bse/bseparasite.hh>  // FIXME
 #include "bsecxxplugin.hh"
 #include "bsebuiltin_externs.cc"
 
diff --git a/bse/bseobject.cc b/bse/bseobject.cc
index d561f78..a61b894 100644
--- a/bse/bseobject.cc
+++ b/bse/bseobject.cc
@@ -3,7 +3,6 @@
 
 #include "bseexports.hh"
 #include "bsestorage.hh"
-#include "bseparasite.hh"
 #include "bsecategories.hh"
 #include "bsegconfig.hh"
 #include "bsesource.hh"                /* debug hack */
diff --git a/bse/bsestorage.cc b/bse/bsestorage.cc
index 15b7a0c..9cb0fca 100644
--- a/bse/bsestorage.cc
+++ b/bse/bsestorage.cc
@@ -7,7 +7,6 @@
 #include "gsldatautils.hh"
 #include "gslcommon.hh"
 #include "bseproject.hh"
-#include "bseparasite.hh"
 #include "bsecxxplugin.hh"
 #include <unistd.h>
 #include <fcntl.h>
@@ -924,8 +923,6 @@ item_restore_try_statement (gpointer    _item,
     expected_token = restore_source_automation (item, self);
   if (expected_token == SFI_TOKEN_UNMATCHED)
     expected_token = BSE_OBJECT_GET_CLASS (item)->restore_private ((BseObject*) item, self, scanner);
-  if (expected_token == SFI_TOKEN_UNMATCHED)
-    expected_token = bse_parasite_restore ((BseObject*) item, self);
   if (expected_token == SFI_TOKEN_UNMATCHED && BSE_IS_CONTAINER (item))
     expected_token = restore_container_child ((BseContainer*) item, self);
   if (expected_token == SFI_TOKEN_UNMATCHED && strcmp (scanner->next_value.v_identifier, "bse-version") == 0)
@@ -1277,7 +1274,6 @@ bse_storage_store_item (BseStorage *self, BseItem *item)
   store_cxx_item_properties (item, self);
   store_item_properties (item, self);
   BSE_OBJECT_GET_CLASS (item)->store_private (BSE_OBJECT (item), self);
-  bse_parasite_store (BSE_OBJECT (item), self);
   if (BSE_IS_CONTAINER (item))
     bse_container_store_children ((BseContainer*) item, self);
   g_object_unref (item);


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