[Algorhythmics-svn] SF.net SVN: algorhythmics:[287] algorhythmicSorting/ofAlgorhythmicSorting

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

Revision: 287
          http://algorhythmics.svn.sourceforge.net/algorhythmics/?rev=287&view=rev
Author:   mchinen
Date:     2011-03-25 15:16:31 +0000 (Fri, 25 Mar 2011)

Log Message:
-----------
fix exponential tone scaling for small ranges

Modified Paths:
--------------
    algorhythmicSorting/ofAlgorhythmicSorting/AlgorhythmicSorting.xcodeproj/project.pbxproj
    algorhythmicSorting/ofAlgorhythmicSorting/src/AlgorhythmicAudioIO.cpp

Modified: algorhythmicSorting/ofAlgorhythmicSorting/AlgorhythmicSorting.xcodeproj/project.pbxproj
===================================================================
--- algorhythmicSorting/ofAlgorhythmicSorting/AlgorhythmicSorting.xcodeproj/project.pbxproj	2011-02-25 19:00:57 UTC (rev 286)
+++ algorhythmicSorting/ofAlgorhythmicSorting/AlgorhythmicSorting.xcodeproj/project.pbxproj	2011-03-25 15:16:31 UTC (rev 287)
@@ -762,6 +762,7 @@
 			isa = PBXProject;
 			buildConfigurationList = E4B69B4D0A3A1720003C02F2 /* Build configuration list for PBXProject "AlgorhythmicSorting" */;
 			compatibilityVersion = "Xcode 2.4";
+			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				English,

Modified: algorhythmicSorting/ofAlgorhythmicSorting/src/AlgorhythmicAudioIO.cpp
===================================================================
--- algorhythmicSorting/ofAlgorhythmicSorting/src/AlgorhythmicAudioIO.cpp	2011-02-25 19:00:57 UTC (rev 286)
+++ algorhythmicSorting/ofAlgorhythmicSorting/src/AlgorhythmicAudioIO.cpp	2011-03-25 15:16:31 UTC (rev 287)
@@ -212,8 +212,8 @@
 			float freq = 0.0f;
          if(index < dataa->doubleArraySize)
          {
-            freq = 100*(100+dataa->doubleArray[index]); //hack - values range from -100 to 100
-            freq = freqRange*exp2cursor(freq/20000.0)+freqMin;
+            freq =  (dataa->doubleArray[index] + 100) / 200.0; //hack - values range from -100 to 100
+            freq = freqRange*exp2cursor(freq, (logf(freqRange+freqMin)/logf(2) - logf(freqMin)/logf(2)))+freqMin;
             pan = ((float)index)/dataa->doubleArraySize;
 			}
 
@@ -272,8 +272,8 @@
                   break;
                else if (dataa->lastNoteIndex < dataa->doubleArraySize)
                {
-                  freq = 100*(100+dataa->doubleArray[index]); //hack - values range from -100 to 100
-                  freq = freqRange*exp2cursor(freq/20000.0)+freqMin;
+                  freq = (dataa->doubleArray[index] + 100) / 200.0; //hack - values range from -100 to 100
+                  freq = freqRange*exp2cursor(freq, (logf(freqRange+freqMin)/logf(2) - logf(freqMin)/logf(2)))+freqMin;
                   pan = ((float)index)/dataa->doubleArraySize;
                }
             }   


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