[Algorhythmics-svn] SF.net SVN: algorhythmics:[284] primesieve/ofprimesieve/src/testApp.cpp

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

Revision: 284
          http://algorhythmics.svn.sourceforge.net/algorhythmics/?rev=284&view=rev
Author:   mchinen
Date:     2011-02-25 15:16:42 +0000 (Fri, 25 Feb 2011)

Log Message:
-----------
fix sin tone form

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

Modified: primesieve/ofprimesieve/src/testApp.cpp
===================================================================
--- primesieve/ofprimesieve/src/testApp.cpp	2011-02-25 13:40:26 UTC (rev 283)
+++ primesieve/ofprimesieve/src/testApp.cpp	2011-02-25 15:16:42 UTC (rev 284)
@@ -12,7 +12,7 @@
     unsigned long long  rest;
     unsigned long long  lastPrime;
 
-    float lastQ;
+    unsigned long long  lastQ;
     float leftoverTime;
     float leftover_samples[kLeftoverSampleSize];
     int num_leftover_samples;
@@ -27,7 +27,7 @@
 static volatile int buffers_ready;
 static int pause_samps;
 #define kFixedTimestep (180/1000000.0f) //  (180/1000000.0f) // (10/1000000.0f)
-#define kInitialSieveG 34359738369LLU //34359738369LLU // 33333333444433LLU
+#define kInitialSieveG 34359738369ULL //34359738369LLU // 33333333444433LLU
 #define kPrimeFoundPauseSecs 1.0f // 2.0f
 
 
@@ -45,7 +45,7 @@
 	
 #ifdef USESINTONE
 	int sampsOut = 0;
-	if (curr_state.q & 1 != curr_state.lastQ  & 1 || curr_state.leftoverTime / (1.0f / kSampleRate)  + curr_state.num_leftover_samples > kLeftoverSampleSize / 2) {
+	if (((curr_state.q & 1) != (curr_state.lastQ  & 1)) || curr_state.leftoverTime / (1.0f / kSampleRate)  + curr_state.num_leftover_samples > kLeftoverSampleSize / 2) {
 		// now sonify based on q
 		bool isOdd = curr_state.q & 1;
 		sampsOut = curr_state.leftoverTime / (1.0/kSampleRate);
@@ -54,7 +54,7 @@
 		
 		for (i = 0; i < sampsOut; i++) {
 			res = curr_state.q & 1 ? 1.0f : -1.0f; // only look at the least significant bit 
-			curr_state.leftover_samples[i + curr_state.num_leftover_samples] = cos(((float)i/sampsOut) * 3.141592653589793238 + (isOdd ? 3.141592653589793238 : 0)); 
+			curr_state.leftover_samples[i + curr_state.num_leftover_samples] = sin(((float)i/sampsOut) * 3.141592653589793238 + (isOdd ? 3.141592653589793238 : 0)); 
 		}
 		
 	}


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