- merged in geiss & sperl's idle preset

- 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

View File

@ -38,9 +38,9 @@
#include <fstream>
Preset::Preset(std::istream & in, const PresetInputs & presetInputs, PresetOutputs & presetOutputs):
Preset::Preset(std::istream & in, const PresetInputs & presetInputs, PresetOutputs & presetOutputs, const std::string & _presetName):
builtinParams(presetInputs, presetOutputs),
file_path("[Input Stream]"),
file_path(_presetName),
m_presetOutputs(presetOutputs),
m_presetInputs(presetInputs)