mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-03-01 21:16:01 +00:00
Code Issues Projects Releases Wiki Activity

bug fix on playlist item highlights (when user presses n / r / [ ).

Browse Source 
some code cleanup 


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@980 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
w1z7ard
2008-04-26 02:24:53 +00:00
parent bd9e2de928
commit abdfe32bc7
6 changed files with 45 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -415,7 +415,6 @@ void projectM::projectM_init ( int gx, int gy, int fps, int texsize, int width,
/** We need to initialise this before the builtin param db otherwise bass/mid etc won't bind correctly */
assert ( !beatDetect );
std::cerr << "pcm new" << std::endl;
if (!_pcm)
_pcm = new PCM();
assert(pcm());
@ -432,7 +431,7 @@ void projectM::projectM_init ( int gx, int gy, int fps, int texsize, int width,
this->presetInputs2.gy = gy;
this->renderer = new Renderer ( width, height, gx, gy, texsize, beatDetect, settings().presetURL, settings().titleFontURL, settings().menuFontURL );
running = true;
#ifdef USE_THREADS
@ -440,11 +439,11 @@ void projectM::projectM_init ( int gx, int gy, int fps, int texsize, int width,
pthread_cond_init(&condition, NULL);
if (pthread_create(&thread, NULL, thread_callback, this) != 0)
{
printf("oops\n");
std::cerr << "failed to allocate a thread! try building with option USE_THREADS turned off" << std::endl;;
exit(1);
}
pthread_mutex_lock( &mutex );
printf("got lock\n");
#endif
renderer->setPresetName ( m_activePreset->presetName() );