diff --git a/src/projectM-engine/MoodBar.cpp b/src/projectM-engine/MoodBar.cpp index 5fcf03c65..0d93b9e6b 100644 --- a/src/projectM-engine/MoodBar.cpp +++ b/src/projectM-engine/MoodBar.cpp @@ -114,7 +114,7 @@ void MoodBar::calculateMood } - std::cerr << "rgb_avg (pre norm): " << rgb_avg[0] << "," << rgb_avg[1] << "," << rgb_avg[2] << std::endl; + //std::cerr << "rgb_avg (pre norm): " << rgb_avg[0] << "," << rgb_avg[1] << "," << rgb_avg[2] << std::endl; //stretchNormalize(rgb_left); //stretchNormalize(rgb_right); @@ -125,7 +125,7 @@ void MoodBar::calculateMood standardNormalize(rgb_avg); -#if 1 +#if 0 std::cerr << "rgb_avg (post norm): " << rgb_avg[0] << "," << rgb_avg[1] << "," << rgb_avg[2] << std::endl; for (i = 0; i < 3; i++) { assert(rgb_avg[i] <= 1.0); @@ -276,7 +276,7 @@ void MoodBar::stretchNormalize (float * rgb) avguu /= (float) tu; avgbb /= (float) tb; - std::cerr << "avguu: " << avguu << ", avgbb: " << avgbb << std::endl; + //std::cerr << "avguu: " << avguu << ", avgbb: " << avgbb << std::endl; // lost from here- what is theory behind this? mini = projectM_fmax (avg + (avgb - avg) * 2.f, avgbb); diff --git a/src/projectM-engine/Preset.cpp b/src/projectM-engine/Preset.cpp index b1be99e2f..4be23f0b9 100755 --- a/src/projectM-engine/Preset.cpp +++ b/src/projectM-engine/Preset.cpp @@ -287,11 +287,13 @@ void Preset::initialize(const std::string & pathname) int retval; preloadInitialize(); + +if (PRESET_DEBUG) std::cerr << "[Preset] loading file \"" << pathname << "\"..." << std::endl; if ((retval = loadPresetFile(pathname)) < 0) { - +if (PRESET_DEBUG) std::cerr << "[Preset] failed to load file \"" << pathname << "\"!" << std::endl; @@ -311,6 +313,7 @@ void Preset::initialize(std::istream & in) if ((retval = readIn(in)) < 0) { + if (PRESET_DEBUG) std::cerr << "[Preset] failed to load from stream " << std::endl; /// @bug how should we handle this problem? a well define exception? @@ -478,7 +481,8 @@ int Preset::readIn(std::istream & fs) { /* Parse any comments */ if (Parser::parse_top_comment(fs) < 0) { - std::cerr << "[Preset::readIn] no left bracket found..." << std::endl; + if (PRESET_DEBUG) + std::cerr << "[Preset::readIn] no left bracket found..." << std::endl; return PROJECTM_FAILURE; } @@ -501,11 +505,11 @@ int Preset::readIn(std::istream & fs) { if (retval == PROJECTM_PARSE_ERROR) { line_mode = UNSET_LINE_MODE; - std::cerr << "[Preset::readIn()] parse error in file \"" << this->absoluteFilePath() << "\"" << std::endl; + // std::cerr << "[Preset::readIn()] parse error in file \"" << this->absoluteFilePath() << "\"" << std::endl; } } - std::cerr << "loadPresetFile: finished line parsing successfully" << std::endl; +// std::cerr << "loadPresetFile: finished line parsing successfully" << std::endl; /* Now the preset has been loaded. Evaluation calls can be made at appropiate diff --git a/src/projectM-engine/projectM.cpp b/src/projectM-engine/projectM.cpp index d1586b2d4..ae26a9884 100755 --- a/src/projectM-engine/projectM.cpp +++ b/src/projectM-engine/projectM.cpp @@ -77,27 +77,20 @@ DLLEXPORT projectM::projectM(int gx, int gy, int fps, int texsize, int width, in } projectM::~projectM() { - std::cerr << "[projectM] DESTROY PRESET TOOLS BEGIN" << std::endl; - destroyPresetTools(); - std::cerr << "[projectM] DESTROY PRESET TOOLS END" << std::endl; - - std::cerr << "[projectM] 1" << std::endl; + destroyPresetTools(); + if (renderer) delete(renderer); -std::cerr << "[projectM] 2" << std::endl; if (textureManager) - delete(textureManager); -std::cerr << "[projectM] 3" << std::endl; + delete(textureManager); if (beatDetect) delete(beatDetect); if (moodBar) delete(moodBar); - -std::cerr << "[projectM] 4" << std::endl; if (renderTarget) delete(renderTarget); -std::cerr << "[projectM] 5" << std::endl; + } @@ -230,12 +223,12 @@ DLLEXPORT void projectM::renderFrame() nohard=(int)(presetInputs.fps*3.5); smoothFrame = (int)(presetInputs.fps * smoothDuration); - printf("SOFT CUT - Smooth started\n"); +// printf("SOFT CUT - Smooth started\n"); } else if ( ( beatDetect->bass-beatDetect->bass_old>beatDetect->beat_sensitivity ) && nohard<0 && false )//@REMOVE { // printf("%f %d %d\n", beatDetect->bass-beatDetect->bass_old,this->frame,this->avgtime); - printf("HARD CUT"); +// printf("HARD CUT"); *m_presetPos = m_presetChooser->weightedRandom (); m_activePreset = m_presetPos->allocate(presetInputs, presetOutputs); @@ -285,7 +278,7 @@ DLLEXPORT void projectM::renderFrame() { m_activePreset = m_activePreset2; smoothFrame=0; - printf("Smooth Finished\n"); +// printf("Smooth Finished\n"); } presetInputs.frame++; //number of frames for current preset @@ -318,7 +311,7 @@ DLLEXPORT void projectM::renderFrame() { // printf("%s:",this->mspf-timediff); int sleepTime = ( unsigned int ) ( this->mspf-timediff ) * 1000; - DWRITE ( "usleep: %d\n", sleepTime ); +// DWRITE ( "usleep: %d\n", sleepTime ); if ( sleepTime > 0 && sleepTime < 100000 ) { if ( usleep ( sleepTime ) != 0 ) {}} @@ -530,7 +523,7 @@ void projectM::projectM_reset() // initMenu(); //DWRITE( "post initMenu()\n" ); - printf ( "mesh: %d %d\n", gx,gy ); +// printf ( "mesh: %d %d\n", gx,gy ); #ifdef PANTS printf ( "maxsamples: %d\n", this->maxsamples ); @@ -552,7 +545,7 @@ void projectM::projectM_reset() renderer->setPresetName(m_activePreset->presetName()); - printf ( "exiting projectM_init()\n" ); +// printf ( "exiting projectM_init()\n" ); } @@ -818,14 +811,8 @@ void projectM::projectM_resetengine() DLLEXPORT void projectM::projectM_resetGL ( int w, int h ) { - - - DWRITE ( "projectM_resetGL(): in: %d x %d\n", w, h ); - /** Stash the new dimensions */ - - renderer->reset ( w,h ); } @@ -887,7 +874,7 @@ int projectM::initPresetTools() *m_presetPos = m_presetChooser->end(); // Load idle preset - std::cerr << "[projectM] Allocating idle preset..." << std::endl; + //std::cerr << "[projectM] Allocating idle preset..." << std::endl; m_activePreset = IdlePreset::allocate(presetInputs, presetOutputs); // Case where no valid presets exist in directory @@ -897,11 +884,11 @@ int projectM::initPresetTools() << m_presetLoader->directoryName() << "\"" << std::endl; } - std::cerr << "[projectM] Idle preset allocated." << std::endl; + //std::cerr << "[projectM] Idle preset allocated." << std::endl; projectM_resetengine(); - std::cerr << "[projectM] engine has been reset." << std::endl; + //std::cerr << "[projectM] engine has been reset." << std::endl; return PROJECTM_SUCCESS; }