[beast/devel: 1/12] BSE: TESTS: port testwavechunk.cc to C++



commit 7cd264747de4a0a8bfb86053bd580caf7ef2d05f
Author: Tim Janik <timj gnu org>
Date:   Sat Mar 16 22:19:07 2013 +0100

    BSE: TESTS: port testwavechunk.cc to C++

 tests/Makefile.am                           |    2 +-
 tests/{testwavechunk.c => testwavechunk.cc} |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6cc62ae..dcab944 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -47,7 +47,7 @@ progs_ldadd     = $(top_builddir)/bse/libbse.la $(BSE_LIBS)
 # testwavechunk
 TESTS                += testwavechunk
 SLOWTESTS            += testwavechunk
-testwavechunk_SOURCES = testwavechunk.c cxxdummy.cc
+testwavechunk_SOURCES = testwavechunk.cc
 testwavechunk_LDADD = $(progs_ldadd)
 # perftest
 TESTS           += perftest
diff --git a/tests/testwavechunk.c b/tests/testwavechunk.cc
similarity index 97%
rename from tests/testwavechunk.c
rename to tests/testwavechunk.cc
index 5e73e91..7d101b4 100644
--- a/tests/testwavechunk.c
+++ b/tests/testwavechunk.cc
@@ -265,7 +265,7 @@ multi_channel_test_one (int pingpong,
   const int LOOP_COUNT = 20;
   const int LOOP_TYPE = pingpong ? GSL_WAVE_LOOP_PINGPONG : GSL_WAVE_LOOP_JUMP;
   size_t my_data_length = channels * frames;
-  float *my_data = malloc (my_data_length * sizeof (float));
+  float *my_data = (float*) malloc (my_data_length * sizeof (float));
   int p, c;
   for (p = 0; p < frames; p++)
     for (c = 0; c < channels; c++)
@@ -275,12 +275,12 @@ multi_channel_test_one (int pingpong,
   gsl_data_handle_unref (myhandle);
   wchunk = gsl_wave_chunk_new (dcache,
                                44100.0, 44.0,
-                               LOOP_TYPE, loop_start * channels, loop_end * channels, LOOP_COUNT);
+                               GslWaveLoopType (LOOP_TYPE), loop_start * channels, loop_end * channels, 
LOOP_COUNT);
   error = gsl_wave_chunk_open (wchunk);
   if (error)
     g_error ("failed to open wave chunk: %s", bse_error_blurb (error));
   gsl_wave_chunk_unref (wchunk);
-  float *expect = malloc (my_data_length * sizeof (float) * (LOOP_COUNT + 1));
+  float *expect = (float*) malloc (my_data_length * sizeof (float) * (LOOP_COUNT + 1));
   float *ep = expect;
   int l;
   ep = gen_expect (ep, 0, loop_start, channels);


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