GNOME.org
 

[beast: 33/95] BSE: rename bsebasics.idl (from bsecore)

commit d587aa24c5117819c747249ba85356c2fdae1d5b
Author: Tim Janik <timj gnu org>
Date:   Mon Mar 18 18:31:18 2013 +0100

    BSE: rename bsebasics.idl (from bsecore)

 bse/Makefile.am                    |   32 ++++++++++++++++----------------
 bse/bse.idl                        |    2 +-
 bse/{bsecore.cc => bsebasics.cc}   |    6 +++---
 bse/{bsecore.idl => bsebasics.idl} |    0
 bse/bsebusmodule.idl               |    2 +-
 bse/bsecxxbase.idl                 |    2 +-
 bse/bsecxxplugin.hh                |    4 ++--
 bse/bseprobe.idl                   |    2 +-
 plugins/bseamplifier.idl           |    9 ++++++---
 po/POTSCAN                         |    2 +-
 10 files changed, 32 insertions(+), 29 deletions(-)
---
diff --git a/bse/Makefile.am b/bse/Makefile.am
index 6082257..7e9a07b 100644
--- a/bse/Makefile.am
+++ b/bse/Makefile.am
@@ -6,7 +6,7 @@ SUBDIRS = icons zintern . tests
 # need -I$(top_srcdir) for <bse/bsedefs.hh>
 # need -I$(top_builddir) for <sfi/sficonfig.h>
 # need -I$(srcdir) for "bseserver.hh" in .genprc.cc
-# need -I. (builddir) for "bsecore.genidl.hh" in bsecore.cc
+# need -I. (builddir) for "bsebasics.genidl.hh" in bsebasics.cc
 INCLUDES += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I.
 DEFS     += @DEFINE__FILE_DIR__@ $(strip \
        $(patsubst %, -DG_LOG_DOMAIN=\"BSE\" -DBSE_COMPILATION, \
@@ -91,19 +91,19 @@ bse_sources = $(strip \
        bseloader-aiff.cc       bseloader-guspatch.cc   bseloader-oggvorbis.cc          bseloader-bsewave.cc \
        bseloader-mad.cc        bseloader-wav.cc        \
        bsebusmodule.cc         \
-       bsecore.cc              \
+       bsebasics.cc            \
        bseprobe.cc             \
 )
 # BSE Synthesis Modules
 bse_idl_sources =
 bse_idl_sources += bsebusmodule.idl
 $(srcdir)/bsebusmodule.cc: bsebusmodule.genidl.hh
-bse_idl_sources += bsecore.idl
-$(srcdir)/bsecxxplugin.cc: bsecore.genidl.hh
+bse_idl_sources += bsebasics.idl
+$(srcdir)/bsecxxplugin.cc: bsebasics.genidl.hh
 bse_idl_sources += bseprobe.idl
 $(srcdir)/bseprobe.cc: bseprobe.genidl.hh
 idl_built_sources = $(bse_idl_sources:.idl=.genidl.hh)
-$(srcdir)/bsebus.cc: bsecore.genidl.hh
+$(srcdir)/bsebus.cc: bsebasics.genidl.hh
 # idl files not used for build rules
 idl_dummy_files = $(strip      \
        bsecxxmodule.idl        \
@@ -119,7 +119,7 @@ bse_proc_sources = $(strip \
 bse_proc_gen_sources = $(bse_proc_sources:.proc=.genprc.cc)
 # non-compile and non-install sources required
 EXTRA_DIST += $(strip \
-       bsecore.idl     bse.idl                                 \
+       bsebasics.idl   bse.idl                                 \
        mktypes.pl      mkcalls.pl      mkcproc.pl              \
        bseconfig.h.in  bsepcmmodule.cc                         \
        bsewave.header                                          \
@@ -136,7 +136,7 @@ pthread_2_lpthread = $(if $(findstring -pthread, $1), -lpthread)
 lib_LTLIBRARIES              = libbse.la
 libbseincludedir                    = $(includedir)/bse
 libbseinclude_HEADERS        = $(bse_public_headers) bse.idl $(bse_idl_sources) bsehack.idl 
$(idl_dummy_files)
-nodist_libbseinclude_HEADERS = bsecore.genidl.hh
+nodist_libbseinclude_HEADERS = bsebasics.genidl.hh
 libbse_la_SOURCES            = $(bse_sources) $(bse_proc_gen_sources)
 libbse_la_LIBADD             = $(top_builddir)/birnet/libbirnet.o $(top_builddir)/sfi/libsfi.o $(BSE_LIBS) 
$(SFI_LIBS) $(RAPICORN_LIBS)
 libbse_la_LDFLAGS            = $(strip                         \
@@ -176,7 +176,7 @@ $(srcdir)/gslfft.cc: @PERLRULE@ $(srcdir)/gsl-fftgen.pl $(srcdir)/gsl-fftconf.sh
 GENERATED_EXTRA_DIST += bsegentypes.h
 $(libbse_la_OBJECTS): bsegentypes.h
 bsegentypes.h: @PERLRULE@ mktypes.pl $(filter-out bsegentypes.cc, $(bse_sources)) $(filter-out 
bsegentypes.h, $(bse_public_headers))
-bsegentypes.h: @PERLRULE@ bsecore.idl $(SFIDL)
+bsegentypes.h: @PERLRULE@ bsebasics.idl $(SFIDL)
        ( \
          cd $(srcdir) \
          && $(GLIB_MKENUMS) \
@@ -186,14 +186,14 @@ bsegentypes.h: @PERLRULE@ bsecore.idl $(SFIDL)
              $(filter-out bsegentypes.h, $(bse_public_headers)) \
          && $(PERL) mktypes.pl --externs $(filter-out bsegentypes.cc, $(bse_sources)) \
        ) > xgen-$(@F) \
-       && $(SFIDL) $(SFIDL_INC) --core-c --header $(srcdir)/bsecore.idl >> xgen-$(@F) \
+       && $(SFIDL) $(SFIDL_INC) --core-c --header $(srcdir)/bsebasics.idl >> xgen-$(@F) \
        && (cmp -s xgen-$(@F) $(srcdir)/bsegentypes.h || cp xgen-$(@F) $(srcdir)/bsegentypes.h) \
        && rm -f xgen-$(@F)
 $(bse_sources): bsegentypes.h
 # bsegentypes.cc
 GENERATED_EXTRA_DIST += bsegentypes.cc
 $(libbse_la_OBJECTS): bsegentypes.cc
-bsegentypes.cc: @PERLRULE@ bsegentypes.h mktypes.pl bsecore.idl $(SFIDL)
+bsegentypes.cc: @PERLRULE@ bsegentypes.h mktypes.pl bsebasics.idl $(SFIDL)
        ( \
          cd $(srcdir) \
          && $(GLIB_MKENUMS) \
@@ -258,12 +258,12 @@ bsebuiltin_array.cc: @PERLRULE@ $(bse_proc_gen_sources) mkcproc.pl
        && $(PERL) mkcproc.pl --functions $(bse_proc_gen_sources) > xgen-$(@F) \
        && cp xgen-$(@F) $(@F) \
        && rm -f xgen-$(@F)
-# bsegencore.cc
-GENERATED_CLEANFILES += bsegencore.cc
-$(srcdir)/bsecore.cc: bsegencore.cc
-bsegencore.cc: bsecore.idl $(SFIDL) bsecore.genidl.hh
+# bsegenbasics.cc
+GENERATED_CLEANFILES += bsegenbasics.cc
+$(srcdir)/bsebasics.cc: bsegenbasics.cc
+bsegenbasics.cc: bsebasics.idl $(SFIDL) bsebasics.genidl.hh
        cd . \
-       && $(SFIDL) $(SFIDL_INC) --core-c --source --init sfidl_types_init $(srcdir)/bsecore.idl >> 
xgen-$(@F) \
+       && $(SFIDL) $(SFIDL_INC) --core-c --source --init sfidl_types_init $(srcdir)/bsebasics.idl >> 
xgen-$(@F) \
        && cp xgen-$(@F) $(@F) \
        && rm -f xgen-$(@F)
 # setup generation of C++ objects from idl files
@@ -275,7 +275,7 @@ bsegencore.cc: bsecore.idl $(SFIDL) bsecore.genidl.hh
 # this file describes the BSE public API and needs to be generated at the
 # end of the build process
 #
-bsehack.idl: bsecore.idl bseprocidl
+bsehack.idl: bsebasics.idl bseprocidl
        grep -v bsehack.idl $(srcdir)/bse.idl | $(SFIDL) $(SFIDL_INC) --list-types - > xgen-2-$(@F)
        echo "/* this file was generated from make $< */" > xgen-$(@F) \
        && ./bseprocidl xgen-2-$(@F) >> xgen-$(@F) \
diff --git a/bse/bse.idl b/bse/bse.idl
index 57d971f..3733209 100644
--- a/bse/bse.idl
+++ b/bse/bse.idl
@@ -1,6 +1,6 @@
 // Licensed GNU LGPL v2.1 or later: http://www.gnu.org/licenses/lgpl.html
 
-include "bsecore.idl" as implementation;
+include "bsebasics.idl" as implementation;
 include "bsecxxbase.idl" as implementation;
 include "bsecxxmodule.idl" as implementation;
 include "bseprobe.idl" as implementation;
diff --git a/bse/bsecore.cc b/bse/bsebasics.cc
similarity index 70%
rename from bse/bsecore.cc
rename to bse/bsebasics.cc
index 9c47f87..ba80f56 100644
--- a/bse/bsecore.cc
+++ b/bse/bsebasics.cc
@@ -1,14 +1,14 @@
 // Licensed GNU LGPL v2.1 or later: http://www.gnu.org/licenses/lgpl.html
 #include "bsetype.hh"        /* import all required types first */
 #include "bsemain.hh"
-#include "bsecxxplugin.hh" /* includes bsecore.genidl.hh for us */
+#include "bsecxxplugin.hh" /* includes bsebasics.genidl.hh for us */
 namespace Bse {
 /* export definitions follow */
 BSE_CXX_DEFINE_EXPORTS();
-BSE_CXX_REGISTER_ALL_TYPES_FROM_BSECORE_IDL();
+BSE_CXX_REGISTER_ALL_TYPES_FROM_BSEBASICS_IDL();
 } // Bse
 /* compile and initialize generated C stubs */
-#include "bsegencore.cc"
+#include "bsegenbasics.cc"
 void
 _bse_init_c_wrappers (void)
 {
diff --git a/bse/bsecore.idl b/bse/bsebasics.idl
similarity index 100%
rename from bse/bsecore.idl
rename to bse/bsebasics.idl
diff --git a/bse/bsebusmodule.idl b/bse/bsebusmodule.idl
index 469b8c1..ce9fd03 100644
--- a/bse/bsebusmodule.idl
+++ b/bse/bsebusmodule.idl
@@ -1,5 +1,5 @@
 // Licensed GNU LGPL v2.1 or later: http://www.gnu.org/licenses/lgpl.html
-include "bsecore.idl";
+include "bsebasics.idl";
 namespace Bse { interface Effect; }; // FIXME: bad workaround
 namespace Bse {
 interface BusModule : Effect {
diff --git a/bse/bsecxxbase.idl b/bse/bsecxxbase.idl
index 195efc8..3d4a1ba 100644
--- a/bse/bsecxxbase.idl
+++ b/bse/bsecxxbase.idl
@@ -1,5 +1,5 @@
 // Licensed GNU LGPL v2.1 or later: http://www.gnu.org/licenses/lgpl.html
-include "bsecore.idl";
+include "bsebasics.idl";
 namespace Bse { // FIXME: bad workarounds
 interface Source;
 }
diff --git a/bse/bsecxxplugin.hh b/bse/bsecxxplugin.hh
index 5283fa9..d330424 100644
--- a/bse/bsecxxplugin.hh
+++ b/bse/bsecxxplugin.hh
@@ -319,8 +319,8 @@ public:
 };
 } // Bse
 /* include generated C++ core types */
-#include <bse/bsecore.genidl.hh>        /* includes bsecxxplugin.hh itself */
-/* define types dependant on bsecore.idl */
+#include <bse/bsebasics.genidl.hh>        /* includes bsecxxplugin.hh itself */
+/* define types dependant on bsebasics.idl */
 namespace Bse {
 /* --- trampoline templates --- */
 template<class ObjectType, typename PropertyID> static void
diff --git a/bse/bseprobe.idl b/bse/bseprobe.idl
index c597890..8e75267 100644
--- a/bse/bseprobe.idl
+++ b/bse/bseprobe.idl
@@ -39,6 +39,6 @@ void source_mass_request   (ProbeRequestSeq prseq);
 Num  source_get_tick_stamp (Source          obj);
 Int  source_get_mix_freq   (Source          obj);
 
-ThreadTotals collect_thread_totals (); // from: bsecore.idl
+ThreadTotals collect_thread_totals (); // from: bsebasics.idl
 
 };
diff --git a/plugins/bseamplifier.idl b/plugins/bseamplifier.idl
index d91404b..608ee4d 100644
--- a/plugins/bseamplifier.idl
+++ b/plugins/bseamplifier.idl
@@ -1,8 +1,11 @@
 // Licensed GNU LGPL v2.1 or later: http://www.gnu.org/licenses/lgpl.html
-include "bse/bsecore.idl";
-namespace Bse { // FIXME: bad workaround
-interface Effect;
+
+include "bse/bsecxxmodule.idl";
+
+namespace Bse {
+interface Effect;      // FIXME: bad workaround
 };
+
 namespace Bse {
 interface Amplifier : Effect {
   Info    icon      = "icons/ampctrl.png";
diff --git a/po/POTSCAN b/po/POTSCAN
index c4b5020..87a4ad8 100644
--- a/po/POTSCAN
+++ b/po/POTSCAN
@@ -63,13 +63,13 @@ beast-gtk/gxk/gxksimplelabel.cc
 birnet/birnetmsg.cc
 birnet/birnetutils.cc
 bse/bseautodoc.cc
+bse/bsebasics.idl
 bse/bsebiquadfilter.cc
 bse/bsebus.cc
 bse/bsebusmodule.idl
 bse/bsebus.proc
 bse/bseconstant.cc
 bse/bsecontainer.proc
-bse/bsecore.idl
 bse/bsedevice.cc
 bse/bseenums.cc
 bse/bseinstrumentinput.cc
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]