From 276044c72d728ca4b0fd63d63fbc8ba455652e9b Mon Sep 17 00:00:00 2001
From: psperl <psperl@6778bc44-b910-0410-a7a0-be141de4315d>
Date: Tue, 7 Aug 2007 03:00:57 +0000
Subject: [PATCH] PJS: treb missing

git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@303 6778bc44-b910-0410-a7a0-be141de4315d
---
 src/projectM-engine/CMakeLists.txt    |  2 +-
 src/projectM-engine/PresetFrameIO.hpp |  1 +
 src/projectM-engine/Renderer.cpp      | 14 +++++++-------
 src/projectM-engine/projectM.cpp      | 12 ++++++++++--
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/projectM-engine/CMakeLists.txt b/src/projectM-engine/CMakeLists.txt
index ee23d6bb4..edfbe5848 100644
--- a/src/projectM-engine/CMakeLists.txt
+++ b/src/projectM-engine/CMakeLists.txt
@@ -4,7 +4,7 @@ ADD_LIBRARY(projectM SHARED projectM.cpp projectM.hpp PBuffer.cpp PBuffer.hpp In
 Param.cpp CustomWave.cpp CustomShape.hpp CustomShape.cpp Param.hpp CustomWave.hpp BeatDetect.hpp console_interface.h 
 Func.hpp Func.cpp Eval.cpp wipemalloc.h browser.cpp PerFrameEqn.cpp PerPointEqn.cpp editor.cpp fftsg.cpp glConsole.cpp  console_interface.cpp
 CValue.hpp Expr.hpp timer.cpp  wipemalloc.cpp PerFrameEqn.hpp PerPixelEqn.hpp PerPointEqn.hpp browser.h BuiltinFuncs.hpp 
-BuiltinFuncs.cpp compare.h editor.h event.h fatal.h fftsg.h glConsole.h menu.h timer.h SplayNode.hpp BuiltinParams.hpp BuiltinParams.cpp Preset.hpp Renderer.cpp Renderer.hpp ParamUtils.hpp PresetLoader.cpp PresetLoader.hpp PresetChooser.hpp PresetChooser.cpp PresetFrameIO.cpp PresetFrameIO.hpp)
+BuiltinFuncs.cpp compare.h editor.h event.h fatal.h fftsg.h glConsole.h  timer.h SplayNode.hpp BuiltinParams.hpp BuiltinParams.cpp Preset.hpp Renderer.cpp Renderer.hpp ParamUtils.hpp PresetLoader.cpp PresetLoader.hpp PresetChooser.hpp PresetChooser.cpp PresetFrameIO.cpp PresetFrameIO.hpp)
 
 OPTION(USE_FTGL "Use FTGL for on-screen fonts" ON)
 
diff --git a/src/projectM-engine/PresetFrameIO.hpp b/src/projectM-engine/PresetFrameIO.hpp
index 49a5f401e..d3c100cac 100644
--- a/src/projectM-engine/PresetFrameIO.hpp
+++ b/src/projectM-engine/PresetFrameIO.hpp
@@ -158,6 +158,7 @@ public:
     float time;
     float bass;
     float mid;
+    float treb;
     float bass_att;
     float mid_att;
     float treb_att;
diff --git a/src/projectM-engine/Renderer.cpp b/src/projectM-engine/Renderer.cpp
index 48f844420..9ea11b280 100644
--- a/src/projectM-engine/Renderer.cpp
+++ b/src/projectM-engine/Renderer.cpp
@@ -107,7 +107,7 @@ void Renderer::RenderFrame(PresetOutputs *presetOutputs, PresetInputs *presetInp
        
       glEnable( GL_TEXTURE_2D );
       if(this->renderTarget->usePbuffers)
-	{
+	{	
 	  glBindTexture( GL_TEXTURE_2D, renderTarget->textureID[1] );
 	}
       else
@@ -146,14 +146,14 @@ void Renderer::RenderFrame(PresetOutputs *presetOutputs, PresetInputs *presetInp
     PerFrame(presetOutputs);               //apply per-frame effects
     Interpolation(presetOutputs,presetInputs);       //apply per-pixel effects
    
-    draw_title_to_texture();      //draw title to texture
+        draw_title_to_texture();      //draw title to texture
 
 //    if(!this->renderTarget->usePbuffers)
       {
 	draw_motion_vectors(presetOutputs);        //draw motion vectors
       }
-    draw_shapes(presetOutputs);
-    draw_custom_waves(presetOutputs);
+          draw_shapes(presetOutputs);
+      draw_custom_waves(presetOutputs);
     draw_waveform(presetOutputs, presetInputs);
     if(presetOutputs->bDarkenCenter)darken_center();
     draw_borders(presetOutputs);               //draw borders
@@ -193,9 +193,9 @@ void Renderer::RenderFrame(PresetOutputs *presetOutputs, PresetInputs *presetInp
     glViewport( 0, 0, this->vw, this->vh );
     glClear( GL_COLOR_BUFFER_BIT );
 
-    if ( this->renderTarget ) {
+    
         glBindTexture( GL_TEXTURE_2D, this->renderTarget->textureID[0] );
-      }
+      
 
       glMatrixMode(GL_PROJECTION);
       glLoadIdentity();  
@@ -252,7 +252,7 @@ void Renderer::Interpolation(PresetOutputs *presetOutputs, PresetInputs *presetI
 #endif
       }
 #endif
-  
+    
   for (x=0;x<presetInputs->gx - 1;x++){
     glBegin(GL_TRIANGLE_STRIP);
     for(y=0;y<presetInputs->gy;y++){
diff --git a/src/projectM-engine/projectM.cpp b/src/projectM-engine/projectM.cpp
index 580938121..7365a7a88 100755
--- a/src/projectM-engine/projectM.cpp
+++ b/src/projectM-engine/projectM.cpp
@@ -109,7 +109,7 @@ DLLEXPORT void projectM::renderFrame()
 
 
 //   assert(m_activePreset.get());
-	m_activePreset->evaluateFrame();
+
 
 
 //     printf("%f %d\n",Time,frame);
@@ -121,6 +121,14 @@ DLLEXPORT void projectM::renderFrame()
 	DWRITE ( "=== bass_att: %f ===\n",
 	         beatDetect->bass_att );
 
+        presetInputs.bass = beatDetect->bass; 
+	presetInputs.mid = beatDetect->mid; 
+	presetInputs.treb = beatDetect->treb; 
+	presetInputs.bass_att = beatDetect->bass_att; 
+	presetInputs.mid_att = beatDetect->mid_att; 
+	presetInputs.treb_att = beatDetect->treb_att; 
+
+	m_activePreset->evaluateFrame();
 	if ( renderer->noSwitch==0 )
 	{
 		nohard--;
@@ -134,7 +142,7 @@ DLLEXPORT void projectM::renderFrame()
 	}
 
 	count++;
-	renderer->presetName = m_activePreset->absoluteFilePath();
+	//	renderer->presetName = m_activePreset->absoluteFilePath();
        
 	renderer->RenderFrame ( &presetOutputs, &presetInputs );