From 768baf61ff309840ba89db86a8904b268b36b42e Mon Sep 17 00:00:00 2001
From: psperl <psperl@6778bc44-b910-0410-a7a0-be141de4315d>
Date: Wed, 29 Aug 2007 23:39:35 +0000
Subject: [PATCH] PJS: completed new conifg

git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@357 6778bc44-b910-0410-a7a0-be141de4315d
---
 src/projectM-xmms/CMakeLists.txt |  2 +-
 src/projectM-xmms/main.cpp       | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/projectM-xmms/CMakeLists.txt b/src/projectM-xmms/CMakeLists.txt
index d0b0c18ea..b36c8b868 100644
--- a/src/projectM-xmms/CMakeLists.txt
+++ b/src/projectM-xmms/CMakeLists.txt
@@ -1,5 +1,5 @@
 PROJECT(xmms_projectM)
-ADD_LIBRARY(xmms_projectM SHARED main.cpp sdltoprojectM.h video_init.cpp)
+ADD_LIBRARY(xmms_projectM SHARED main.cpp sdltoprojectM.h video_init.cpp ConfigFile.h ConfigFile.cpp)
 
 INCLUDE(FindPkgConfig.cmake)
 
diff --git a/src/projectM-xmms/main.cpp b/src/projectM-xmms/main.cpp
index 75cbe8c85..2484f6d68 100755
--- a/src/projectM-xmms/main.cpp
+++ b/src/projectM-xmms/main.cpp
@@ -1,5 +1,5 @@
 /* 
-projectM v0.95 - xmms-projectm.sourceforge.net
+projectM v1.01 - xmms-projectm.sourceforge.net
 --------------------------------------------------
 
 Lead Developers:  Carmelo Piccione (cep@andrew.cmu.edu) &
@@ -40,6 +40,7 @@ www.gamedev.net/reference/programming/features/beatdetection/
 #include <GL/glu.h>
 #include <xmms/xmmsctrl.h>
 #include <math.h>
+#include "ConfigFile.h"
 
 #include <libprojectM/BeatDetect.hpp>
 #include <libprojectM/PCM.hpp>
@@ -104,8 +105,7 @@ SDL_mutex *mutex;
 SDL_Event event;
 
 SDL_Surface *screen;
-//SDL_RenderTarget *RenderTarget = NULL;
-//GLuint RenderTargetTextureID;
+
 
 projectM * globalPM = NULL;
 
@@ -168,9 +168,13 @@ int worker_func(void*)
  std::string config_file;
  config_file = read_config();
 
- int wvw = 512;
- int wvh = 512;
+ ConfigFile config(config_file);
+
+ int wvw = config.read<int>( "Window Width", 512 );
+ int wvh = config.read<int>( "Window Height", 512 );
  int fullscreen = 0;
+ if (config.read("Fullscreen", true)) fullscreen = 1;
+      else fullscreen = 0;
 
   init_display(wvw,wvh,&fvw,&fvh,fullscreen);   
   SDL_WM_SetCaption("projectM v1.00", "projectM v1.00");