mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-03-17 04:45:33 +00:00
Code Issues Projects Releases Wiki Activity

Commit of projectM-wmp and GLEW (for building on win32).

Browse Source 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@483 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
psperl
2007-09-26 20:41:48 +00:00
parent 87e78290ae
commit 7d351e4d2a
564 changed files with 48184 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/projectM-engine/projectM.cpp
View File

@ -68,12 +68,12 @@ double smoothDuration = 5;
//int smoothFrame = 0;
int oldFrame = 1;
DLLEXPORT projectM::projectM(int gx, int gy, int fps, int texsize, int width, int height) :renderer(0), renderTarget(0), smoothFrame(0), beatDetect ( 0 ), moodBar(0)
DLLEXPORT projectM::projectM(int gx, int gy, int fps, int texsize, int width, int height, std::string preset_url) :renderer(0), renderTarget(0), smoothFrame(0), beatDetect ( 0 ), moodBar(0),presetURL(preset_url)
{
presetURL = preset_url;
projectM_reset();
projectM_init(gx, gy, fps, texsize, wvw, wvh);
projectM_resetGL( wvw, wvh );
projectM_init(gx, gy, fps, texsize, width, height);
projectM_resetGL( width, height );
}
projectM::~projectM() {
@ -170,7 +170,7 @@ DLLEXPORT void projectM::renderFrame()
beatDetect->detectFromSamples();
#ifndef USE_MOODBAR
#define USE_MOODBAR
//#define USE_MOODBAR
#endif
@ -407,7 +407,7 @@ void projectM::projectM_reset()
assert(!beatDetect);
beatDetect = new BeatDetect();
moodBar = new MoodBar(beatDetect->pcm);
//moodBar = new MoodBar(beatDetect->pcm);
/* Preset loading function */
initPresetTools();