mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-03-17 12:55:15 +00:00
Code Issues Projects Releases Wiki Activity

- fixed serious bug introduced with win32 compatibility

Browse Source 
- preset name display now only shows file name, not full path



git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@471 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
w1z7ard
2007-09-22 17:20:47 +00:00
parent 665669afee
commit fa900a0deb
13 changed files with 130 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/projectM-engine/Preset.cpp
View File

@ -38,12 +38,11 @@
#include <fstream>
Preset::Preset(std::istream & in, const PresetInputs & presetInputs, PresetOutputs & presetOutputs, const std::string & _presetName):
Preset::Preset(std::istream & in, const std::string & presetName, const PresetInputs & presetInputs, PresetOutputs & presetOutputs):
builtinParams(presetInputs, presetOutputs),
file_path(_presetName),
m_presetName(presetName),
m_presetOutputs(presetOutputs),
m_presetInputs(presetInputs)
{
m_presetOutputs.customWaves.clear();
@ -54,9 +53,10 @@ Preset::Preset(std::istream & in, const PresetInputs & presetInputs, PresetOutpu
}
Preset::Preset(const std::string & filename, const PresetInputs & presetInputs, PresetOutputs & presetOutputs):
Preset::Preset(const std::string & absoluteFilePath, const std::string & presetName, const PresetInputs & presetInputs, PresetOutputs & presetOutputs):
builtinParams(presetInputs, presetOutputs),
file_path(filename),
m_absoluteFilePath(absoluteFilePath),
m_presetName(presetName),
m_presetOutputs(presetOutputs),
m_presetInputs(presetInputs)
{
@ -64,7 +64,7 @@ Preset::Preset(const std::string & filename, const PresetInputs & presetInputs,
m_presetOutputs.customWaves.clear();
m_presetOutputs.customShapes.clear();
initialize(filename);
initialize(absoluteFilePath);
}
@ -491,7 +491,7 @@ int Preset::readIn(std::istream & fs) {
return PROJECTM_ERROR;
}
this->name = std::string(tmp_name);
/// @note We ignore the preset name because [preset00] is just not so useful
// Loop through each line in file, trying to succesfully parse the file.
// If a line does not parse correctly, keep trucking along to next line.