From b9144d1eccbbbbee96da7ccc6b705fdf8ab4d7df Mon Sep 17 00:00:00 2001
From: psperl <psperl@6778bc44-b910-0410-a7a0-be141de4315d>
Date: Tue, 7 Aug 2007 01:51:43 +0000
Subject: [PATCH] PJS: fixed xmms resizing, enabled FBO and corrected bug with
 texsize paramater initialization

git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@297 6778bc44-b910-0410-a7a0-be141de4315d
---
 src/projectM-engine/PBuffer.cpp  |  2 +-
 src/projectM-engine/Renderer.cpp |  9 ++++-----
 src/projectM-engine/Renderer.hpp |  1 -
 src/projectM-xmms/main.cpp       | 16 ++++++++--------
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/projectM-engine/PBuffer.cpp b/src/projectM-engine/PBuffer.cpp
index d960acc60..689bdf698 100755
--- a/src/projectM-engine/PBuffer.cpp
+++ b/src/projectM-engine/PBuffer.cpp
@@ -39,7 +39,7 @@ RenderTarget::RenderTarget(int texsize, int width, int height) : usePbuffers(fal
 
     int mindim = 0;
     int origtexsize = 0;
-    int usePbuffers = 1;
+    this->usePbuffers = 1;
 
     this->texsize=texsize;
 
diff --git a/src/projectM-engine/Renderer.cpp b/src/projectM-engine/Renderer.cpp
index 80f0dc8fc..a3eefc382 100644
--- a/src/projectM-engine/Renderer.cpp
+++ b/src/projectM-engine/Renderer.cpp
@@ -1494,8 +1494,7 @@ void Renderer::draw_preset() {
 	title_font->FaceSize((unsigned)(12*(this->vh/512.0)));
 	if(this->noSwitch) title_font->Render("[LOCKED]  " );
 	title_font->FaceSize((unsigned)(20*(this->vh/512.0)));
-	if (this->presetName)
-        	title_font->Render(this->presetName );
+	//if (this->presetName) title_font->Render(this->presetName );
 
                  
         
@@ -1586,11 +1585,11 @@ sprintf( buffer, " (%f)", this->aspect);
 
   glRasterPos2f(0, -.13+offset);
   sprintf( buffer, "viewport: %d x %d", this->vw, this->vh);
+
   other_font->Render(buffer);
-  /* REME: FIX
   glRasterPos2f(0, -.17+offset);  
-  other_font->Render((this->renderer->renderTarget->usePbuffers ? "     FBO: on" : "     FBO: off"));
-  */
+  other_font->Render((this->renderTarget->usePbuffers ? "     FBO: on" : "     FBO: off"));
+  
   glRasterPos2f(0, -.21+offset); 
   sprintf( buffer, "    mesh: %d x %d", presetInputs->gx,presetInputs->gy);
   other_font->Render(buffer);
diff --git a/src/projectM-engine/Renderer.hpp b/src/projectM-engine/Renderer.hpp
index 128ba663a..029e9daec 100644
--- a/src/projectM-engine/Renderer.hpp
+++ b/src/projectM-engine/Renderer.hpp
@@ -50,7 +50,6 @@ FTGLPolygonFont *poly_font;
     int studio;
     int correction;
 
-    char *presetName;
     char *fontURL;
 
     int noSwitch;
diff --git a/src/projectM-xmms/main.cpp b/src/projectM-xmms/main.cpp
index 26eacefd5..6de262a07 100755
--- a/src/projectM-xmms/main.cpp
+++ b/src/projectM-xmms/main.cpp
@@ -54,7 +54,7 @@ www.gamedev.net/reference/programming/features/beatdetection/
 extern "C" void projectM_xmms_init(void); 
 extern "C" void projectM_cleanup(void);
 extern "C" void projectM_about(void);
-extern "C" void projectM_configure(void)
+extern "C" void projectM_configure(void);
 extern "C" void projectM_playback_start(void);
 extern "C" void projectM_playback_stop(void);
 extern "C" void projectM_render_pcm(gint16 pcm_data[2][512]);
@@ -192,8 +192,8 @@ int worker_func(void*)
 	globalPM->presetURL = (char *)malloc( sizeof( char ) * 512 );
 	strcpy( globalPM->presetURL, preset_dir );	
  
-
-    globalPM->projectM_init(gx, gy, texsize, fps, fullscreen ? fvw:wvw, fullscreen? fvh:wvh);
+      
+    globalPM->projectM_init(gx, gy, fps, texsize, fullscreen ? fvw:wvw, fullscreen? fvh:wvh);
   
     globalPM->projectM_resetGL( wvw, wvh );
 
@@ -209,16 +209,13 @@ int worker_func(void*)
         SDL_Event event;
         while ( SDL_PollEvent( &event ) ) {
             /** Translate into projectM codes and process */
-            evt = sdl2pmEvent( event );
-            if (!((event.type == SDL_KEYDOWN) || (event.type == SDL_KEYUP)))
-		continue;
+            evt = sdl2pmEvent( event );	  
 
             key = sdl2pmKeycode( event.key.keysym.sym );
             mod = sdl2pmModifier( event.key.keysym.mod );
 
             if ( evt == PROJECTM_KEYDOWN ) {                 
-	      printf("menu-imp\n");
-
+	   
 	      if(key == PROJECTM_K_f)
 		{
 		 
@@ -240,6 +237,9 @@ int worker_func(void*)
               }
 	    else if ( evt == PROJECTM_VIDEORESIZE )
 	      {
+
+	       
+
 		wvw=event.resize.w;
 		wvh=event.resize.h;