From e0e7c30ab82bb94d86b3faef210a3fd60b8bae29 Mon Sep 17 00:00:00 2001
From: w1z7ard <w1z7ard@6778bc44-b910-0410-a7a0-be141de4315d>
Date: Thu, 16 Aug 2007 03:22:25 +0000
Subject: [PATCH] fixed preset name display on my dist at least

git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@342 6778bc44-b910-0410-a7a0-be141de4315d
---
 src/projectM-engine/Renderer.cpp          |  9 ++++-----
 src/projectM-engine/Renderer.hpp          | 14 +++++++++++++-
 src/projectM-engine/console_interface.cpp |  5 ++++-
 src/projectM-engine/projectM.cpp          |  3 ++-
 src/projectM-engine/projectM.hpp          |  2 +-
 5 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/projectM-engine/Renderer.cpp b/src/projectM-engine/Renderer.cpp
index 93469251d..81997e154 100644
--- a/src/projectM-engine/Renderer.cpp
+++ b/src/projectM-engine/Renderer.cpp
@@ -9,12 +9,10 @@
 
 class Preset;
 
-Renderer::Renderer(int width, int height, int gx, int gy, RenderTarget *renderTarget, BeatDetect *beatDetect, char* fontURL)
+Renderer::Renderer(int width, int height, int gx, int gy, RenderTarget *renderTarget, BeatDetect *beatDetect, char* fontURL): m_presetName("None")
 {
   int x; int y; 
-  
-  this->presetName = "None";
-
+ 
   this->gx=gx;
   this->gy=gy;
 
@@ -1419,7 +1417,8 @@ void Renderer::draw_preset() {
 	if(this->noSwitch) title_font->Render("[LOCKED]  " );
 	title_font->FaceSize((unsigned)(20*(this->vh/512.0)));
        
-	//	title_font->Render(this->presetName.c_str() );
+        std::cerr << "displaying preset name:\"" << presetName() << "\"" << std::endl;
+	title_font->Render(this->presetName().c_str() );
 
                  
         
diff --git a/src/projectM-engine/Renderer.hpp b/src/projectM-engine/Renderer.hpp
index d3863c084..ffda223a9 100644
--- a/src/projectM-engine/Renderer.hpp
+++ b/src/projectM-engine/Renderer.hpp
@@ -52,7 +52,7 @@ FTGLPolygonFont *poly_font;
     int correction;
 
     char *fontURL;
-    std::string presetName;
+    std::string m_presetName;
 
     int noSwitch;
 
@@ -68,6 +68,18 @@ char *title;
   void PerPixelMath(PresetOutputs *presetOutputs,  PresetInputs *presetInputs);
   void WaveformMath(PresetOutputs *presetOutputs, PresetInputs *presetInputs, bool isSmoothing);
 
+	void setPresetName(const std::string& theValue)
+	{
+	  m_presetName = theValue;
+	}
+	
+
+	std::string presetName() const
+	{
+	  return m_presetName;
+	}
+	
+
 private:
   void draw_waveform(PresetOutputs * presetOutputs);
   void PerFrame(PresetOutputs *presetOutputs);
diff --git a/src/projectM-engine/console_interface.cpp b/src/projectM-engine/console_interface.cpp
index 8599e26fc..7dd66201a 100755
--- a/src/projectM-engine/console_interface.cpp
+++ b/src/projectM-engine/console_interface.cpp
@@ -171,7 +171,8 @@ void projectM::default_key_handler( projectMEvent event, projectMKeycode keycode
 		}
 
 		m_activePreset =  m_presetPos->allocate(this->presetInputs, this->presetOutputs);
-
+		renderer->setPresetName(m_activePreset->absoluteFilePath());
+	
                 presetInputs.frame = 0;
 		smoothFrame = 0;
 	      break;
@@ -183,6 +184,7 @@ void projectM::default_key_handler( projectMEvent event, projectMKeycode keycode
 
 		m_activePreset = m_presetChooser->weightedRandom<PresetChooser::UniformRandomFunctor>
 			(this->presetInputs, this->presetOutputs);
+		renderer->setPresetName(m_activePreset->absoluteFilePath());
 		presetInputs.frame = 0;
 		smoothFrame = 0;
 		break;
@@ -198,6 +200,7 @@ void projectM::default_key_handler( projectMEvent event, projectMKeycode keycode
 		}
 
 		m_activePreset =  m_presetPos->allocate(this->presetInputs, this->presetOutputs);
+		renderer->setPresetName(m_activePreset->absoluteFilePath());
                 presetInputs.frame = 0;
 		smoothFrame = 0;
 	      break;
diff --git a/src/projectM-engine/projectM.cpp b/src/projectM-engine/projectM.cpp
index 43fcb9875..22e00e5aa 100755
--- a/src/projectM-engine/projectM.cpp
+++ b/src/projectM-engine/projectM.cpp
@@ -97,7 +97,7 @@ DLLEXPORT void projectM::renderFrame()
   //     printf("Start of loop at %d\n",timestart);
   mspf= ( int ) ( 1000.0/ ( float ) presetInputs.fps ); //milliseconds per frame
   
-  
+
 #ifndef WIN32
   presetInputs.time = getTicks ( &startTime ) * 0.001;
 #else
@@ -460,6 +460,7 @@ DLLEXPORT void projectM::projectM_init ( int gx, int gy, int fps, int texsize, i
 	this->presetInputs.gy = gy;
 
 	this->renderer = new Renderer ( width, height, gx, gy, renderTarget, beatDetect, fontURL );
+	renderer->setPresetName(m_activePreset->absoluteFilePath());
 
 	printf ( "exiting projectM_init()\n" );
 }
diff --git a/src/projectM-engine/projectM.hpp b/src/projectM-engine/projectM.hpp
index 523d11e57..a0167e774 100755
--- a/src/projectM-engine/projectM.hpp
+++ b/src/projectM-engine/projectM.hpp
@@ -176,7 +176,7 @@ public:
     BeatDetect * beatDetect;
 
   
-
+    
     /** Functions */
     DLLEXPORT projectM();