[beast/devel: 11/15] BSE: compile gslwavechunk and gslwaveosc as C++

[Tim Janik <timj src gnome org>]

commit d1f6bd247c748464cf3d1a08beb503837bbf6f89
Author: Tim Janik <timj gnu org>
Date:   Sun Dec 16 15:48:19 2012 +0100

    BSE: compile gslwavechunk and gslwaveosc as C++

 bse/Makefile.am                             |    6 ++--
 bse/{gslwavechunk.c => gslwavechunk.cc}     |   10 ++++----
 bse/{gslwaveosc-aux.c => gslwaveosc-aux.cc} |    0
 bse/{gslwaveosc.c => gslwaveosc.cc}         |   32 +++++++++++++-------------
 4 files changed, 24 insertions(+), 24 deletions(-)
---
diff --git a/bse/Makefile.am b/bse/Makefile.am
index 292dfd9..f365b60 100644
--- a/bse/Makefile.am
+++ b/bse/Makefile.am
@@ -60,11 +60,11 @@ bse_public_headers = $(strip \
 )
 # BSE C & C++ sources
 bse_sources = $(strip \
-	gslfft.c		gsloscillator.c	gsldatahandle.c	gslwavechunk.c \
+	gslfft.c		gsloscillator.c	gsldatahandle.c	gslwavechunk.cc \
 	gslfilter.c		gslcommon.c \
 	gsldatahandle-vorbis.c	gslvorbis-enc.c	gsldatacache.c	gslvorbis-cutter.c \
 	gsldatahandle-mad.c	           	gslfilehash.c	gsldatautils.c	\
-	gslwaveosc.c		gslosctable.c	gslmagic.c	                 \
+	gslwaveosc.cc		gslosctable.c	gslmagic.c	                 \
 	\
 	bseengine.c		bseenginemaster.c	bseengineschedule.c		bseengineutils.c \
 	bsebus.cc		bsecategories.cc 	\
@@ -126,7 +126,7 @@ EXTRA_DIST += $(strip \
 	bseconfig.h.in	bsepcmmodule.cc				\
 	bsewave.header						\
 	gsl-fftgen.pl	gsl-fftconf.sh	gsloscillator-aux.c	\
-	gslincluder.c	gslwaveosc-aux.c			\
+	gslincluder.c	gslwaveosc-aux.cc			\
 )
 
 # -pthread -> -lpthread hack (required for libtool library linkage)
diff --git a/bse/gslwavechunk.c b/bse/gslwavechunk.cc
similarity index 98%
rename from bse/gslwavechunk.c
rename to bse/gslwavechunk.cc
index bec1431..904bf06 100644
--- a/bse/gslwavechunk.c
+++ b/bse/gslwavechunk.cc
@@ -110,7 +110,7 @@ fill_block (GslWaveChunk *wchunk,
     wpos.dir = -wpos.dir;
   wpos.pos = offset;
   wpos.loop_count = loop_count;
-  dnode = gsl_data_cache_ref_node (wchunk->dcache, 0, TRUE);
+  dnode = gsl_data_cache_ref_node (wchunk->dcache, 0, GSL_DATA_CACHE_DEMAND_LOAD);
   for (i = 0; i < length; i++)
     {
       GslLong offset = wpos.pos;
@@ -122,7 +122,7 @@ fill_block (GslWaveChunk *wchunk,
 	  if (offset < dnode->offset || offset >= dnode->offset + dnode_length)
 	    {
 	      gsl_data_cache_unref_node (wchunk->dcache, dnode);
-	      dnode = gsl_data_cache_ref_node (wchunk->dcache, offset, TRUE);
+	      dnode = gsl_data_cache_ref_node (wchunk->dcache, offset, GSL_DATA_CACHE_DEMAND_LOAD);
 	    }
 	  block[i] = dnode->data[offset - dnode->offset];
 	}
@@ -490,7 +490,7 @@ gsl_wave_chunk_use_block (GslWaveChunk      *wchunk,
 	  else
 	    offset = iter.lbound + iter.rel_pos;
 	  max_length = reverse ? offset - iter.lbound : iter.ubound - offset;
-	  dnode = gsl_data_cache_ref_node (wchunk->dcache, offset, TRUE); /* FIXME: demand_load */
+	  dnode = gsl_data_cache_ref_node (wchunk->dcache, offset, GSL_DATA_CACHE_DEMAND_LOAD);
 	  offset -= dnode->offset;
 	  block->start = dnode->data + offset;
 	  if (reverse)
@@ -542,7 +542,7 @@ gsl_wave_chunk_unuse_block (GslWaveChunk      *wchunk,
   
   if (block->node)
     {
-      gsl_data_cache_unref_node (wchunk->dcache, block->node);
+      gsl_data_cache_unref_node (wchunk->dcache, (GslDataCacheNode*) block->node);
       block->node = NULL;
     }
 }
@@ -803,7 +803,7 @@ gsl_wave_loop_type_to_string (GslWaveLoopType wave_loop)
 GslWaveLoopType
 gsl_wave_loop_type_from_string (const gchar *string)
 {
-  g_return_val_if_fail (string != NULL, 0);
+  g_return_val_if_fail (string != NULL, GSL_WAVE_LOOP_NONE);
   
   while (*string == ' ')
     string++;
diff --git a/bse/gslwaveosc-aux.c b/bse/gslwaveosc-aux.cc
similarity index 100%
rename from bse/gslwaveosc-aux.c
rename to bse/gslwaveosc-aux.cc
diff --git a/bse/gslwaveosc.c b/bse/gslwaveosc.cc
similarity index 96%
rename from bse/gslwaveosc.c
rename to bse/gslwaveosc.cc
index 448f744..901ed3a 100644
--- a/bse/gslwaveosc.c
+++ b/bse/gslwaveosc.cc
@@ -42,60 +42,60 @@ static void	wave_osc_transform_filter	(GslWaveOscData *wosc,
 #define WOSC_MIX_WITH_EXP_FM    (8)
 #define WOSC_MIX_VARIANT_NAME	wosc_process_sfme
 #define WOSC_MIX_VARIANT	(WOSC_MIX_WITH_SYNC | WOSC_MIX_WITH_FREQ | WOSC_MIX_WITH_MOD | WOSC_MIX_WITH_EXP_FM)
-#include "gslwaveosc-aux.c"
+#include "gslwaveosc-aux.cc"
 #define WOSC_MIX_VARIANT_NAME	wosc_process_sfm_
 #define WOSC_MIX_VARIANT	(WOSC_MIX_WITH_SYNC | WOSC_MIX_WITH_FREQ | WOSC_MIX_WITH_MOD | 0                   )
-#include "gslwaveosc-aux.c"
+#include "gslwaveosc-aux.cc"
 #if 0
 #define WOSC_MIX_VARIANT_NAME	wosc_process_sf_e
 #define WOSC_MIX_VARIANT	(WOSC_MIX_WITH_SYNC | WOSC_MIX_WITH_FREQ | 0                 | WOSC_MIX_WITH_EXP_FM)
-#include "gslwaveosc-aux.c"
+#include "gslwaveosc-aux.cc"
 #endif
 #define WOSC_MIX_VARIANT_NAME	wosc_process_sf__
 #define WOSC_MIX_VARIANT	(WOSC_MIX_WITH_SYNC | WOSC_MIX_WITH_FREQ | 0                 | 0                   )
-#include "gslwaveosc-aux.c"
+#include "gslwaveosc-aux.cc"
 #define WOSC_MIX_VARIANT_NAME	wosc_process_s_me
 #define WOSC_MIX_VARIANT	(WOSC_MIX_WITH_SYNC | 0                  | WOSC_MIX_WITH_MOD | WOSC_MIX_WITH_EXP_FM)
-#include "gslwaveosc-aux.c"
+#include "gslwaveosc-aux.cc"
 #define WOSC_MIX_VARIANT_NAME	wosc_process_s_m_
 #define WOSC_MIX_VARIANT	(WOSC_MIX_WITH_SYNC | 0                  | WOSC_MIX_WITH_MOD | 0                   )
-#include "gslwaveosc-aux.c"
+#include "gslwaveosc-aux.cc"
 #if 0
 #define WOSC_MIX_VARIANT_NAME	wosc_process_s__e
 #define WOSC_MIX_VARIANT	(WOSC_MIX_WITH_SYNC | 0                  | 0                 | WOSC_MIX_WITH_EXP_FM)
-#include "gslwaveosc-aux.c"
+#include "gslwaveosc-aux.cc"
 #endif
 #define WOSC_MIX_VARIANT_NAME	wosc_process_s___
 #define WOSC_MIX_VARIANT	(WOSC_MIX_WITH_SYNC | 0                  | 0                 | 0                   )
-#include "gslwaveosc-aux.c"
+#include "gslwaveosc-aux.cc"
 #define WOSC_MIX_VARIANT_NAME	wosc_process__fme
 #define WOSC_MIX_VARIANT	(0                  | WOSC_MIX_WITH_FREQ | WOSC_MIX_WITH_MOD | WOSC_MIX_WITH_EXP_FM)
-#include "gslwaveosc-aux.c"
+#include "gslwaveosc-aux.cc"
 #define WOSC_MIX_VARIANT_NAME	wosc_process__fm_
 #define WOSC_MIX_VARIANT	(0                  | WOSC_MIX_WITH_FREQ | WOSC_MIX_WITH_MOD | 0                   )
-#include "gslwaveosc-aux.c"
+#include "gslwaveosc-aux.cc"
 #if 0
 #define WOSC_MIX_VARIANT_NAME	wosc_process__f_e
 #define WOSC_MIX_VARIANT	(0                  | WOSC_MIX_WITH_FREQ | 0                 | WOSC_MIX_WITH_EXP_FM)
-#include "gslwaveosc-aux.c"
+#include "gslwaveosc-aux.cc"
 #endif
 #define WOSC_MIX_VARIANT_NAME	wosc_process__f__
 #define WOSC_MIX_VARIANT	(0                  | WOSC_MIX_WITH_FREQ | 0                 | 0                   )
-#include "gslwaveosc-aux.c"
+#include "gslwaveosc-aux.cc"
 #define WOSC_MIX_VARIANT_NAME	wosc_process___me
 #define WOSC_MIX_VARIANT	(0                  | 0                  | WOSC_MIX_WITH_MOD | WOSC_MIX_WITH_EXP_FM)
-#include "gslwaveosc-aux.c"
+#include "gslwaveosc-aux.cc"
 #define WOSC_MIX_VARIANT_NAME	wosc_process___m_
 #define WOSC_MIX_VARIANT	(0                  | 0                  | WOSC_MIX_WITH_MOD | 0                   )
-#include "gslwaveosc-aux.c"
+#include "gslwaveosc-aux.cc"
 #if 0
 #define WOSC_MIX_VARIANT_NAME	wosc_process____e
 #define WOSC_MIX_VARIANT	(0                  | 0                  | 0                 | WOSC_MIX_WITH_EXP_FM)
-#include "gslwaveosc-aux.c"
+#include "gslwaveosc-aux.cc"
 #endif
 #define WOSC_MIX_VARIANT_NAME	wosc_process_____
 #define WOSC_MIX_VARIANT	(0                  | 0                  | 0                 | 0                   )
-#include "gslwaveosc-aux.c"
+#include "gslwaveosc-aux.cc"
 
 
 /* --- functions --- */