mirror of
https://github.com/projectM-visualizer/projectm.git
synced 2026-03-17 12:55:15 +00:00
- 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:
@ -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)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user