[Algorhythmics-svn] SF.net SVN: algorhythmics:[286] primesieve/ofprimesieve/src

[<mc...@us...>]

Revision: 286
          http://algorhythmics.svn.sourceforge.net/algorhythmics/?rev=286&view=rev
Author:   mchinen
Date:     2011-02-25 19:00:57 +0000 (Fri, 25 Feb 2011)

Log Message:
-----------
fix interleaved bug

Modified Paths:
--------------
    primesieve/ofprimesieve/src/AlgorhythmicAudioIO.cpp
    primesieve/ofprimesieve/src/testApp.cpp

Modified: primesieve/ofprimesieve/src/AlgorhythmicAudioIO.cpp
===================================================================
--- primesieve/ofprimesieve/src/AlgorhythmicAudioIO.cpp	2011-02-25 17:53:23 UTC (rev 285)
+++ primesieve/ofprimesieve/src/AlgorhythmicAudioIO.cpp	2011-02-25 19:00:57 UTC (rev 286)
@@ -89,10 +89,12 @@
    bool click = false;    
    float* sieveBuf = pop_buffer();
    
+   for (int i = 0; i < framesPerBuffer; i ++) {
    for( int z = 0; z < NUM_CHANNELS; z++ ) {
-      memcpy((((float*)outputBuffer)+framesPerBuffer*z), sieveBuf, framesPerBuffer*sizeof(float));
+      ((float*)outputBuffer)[i*NUM_CHANNELS + z] = sieveBuf[i];
+//      memcpy((((float*)outputBuffer)+framesPerBuffer*z), sieveBuf, framesPerBuffer*sizeof(float));
    }
-
+   }
    
    // Clip output to [-1.0,+1.0] range 
    for(unsigned int i = 0; i < framesPerBuffer*NUM_CHANNELS; i++)

Modified: primesieve/ofprimesieve/src/testApp.cpp
===================================================================
--- primesieve/ofprimesieve/src/testApp.cpp	2011-02-25 17:53:23 UTC (rev 285)
+++ primesieve/ofprimesieve/src/testApp.cpp	2011-02-25 19:00:57 UTC (rev 286)
@@ -137,12 +137,11 @@
 {
     float* res = output_buffers[output_buffer_cursor];
     
-    output_buffer_cursor = (output_buffer_cursor + 1) % kNumSieveOutputBuffers;
-    buffers_ready--;
-
     while(!fill_buffers())
        ;
-    
+    output_buffer_cursor = (output_buffer_cursor + 1) % kNumSieveOutputBuffers;
+
+    buffers_ready--;
     return res;
 }
 
@@ -152,7 +151,7 @@
     int fpb = AlgorhythmicAudioIO::Instance()->GetFramesPerBuffer();
     
     if (!output_buffers) {
-        output_buffers = new float*[100];
+        output_buffers = new float*[kNumSieveOutputBuffers];
         for (i = 0; i < kNumSieveOutputBuffers; i++)
             output_buffers[i] = new float[fpb];
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.