mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-02-21 06:05:38 +00:00
Code Issues Projects Releases Wiki Activity

- merged in geiss & sperl's idle preset

Browse Source 
- preset chooser doesn't abort when preset dir is invalid
- added smooth preset switch cancellation when preset chooser empty (untested)
- changed preset construct to allow for custom preset name when using 
	input streams as source



git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@427 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
w1z7ard
2007-09-14 19:45:45 +00:00
parent 94c6036ee8
commit 4cf4eeae80
7 changed files with 300 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -174,7 +174,7 @@ DLLEXPORT void projectM::renderFrame()
m_activePreset->evaluateFrame();
if ( renderer->noSwitch==0 )
if ( renderer->noSwitch==0 && !m_presetChooser->empty())
{
if ( presetInputs.progress>1.0 )
{