From 5b719cf5dae4de09158d40f5e9c0603e3381df59 Mon Sep 17 00:00:00 2001 From: w1z7ard Date: Mon, 9 Jul 2007 03:35:18 +0000 Subject: [PATCH] fixed yet another reference error. next is in renderer again git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@261 6778bc44-b910-0410-a7a0-be141de4315d --- src/linux/projectmDev10.kdevelop | 2 +- src/projectM-engine/PresetChooser.hpp | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/linux/projectmDev10.kdevelop b/src/linux/projectmDev10.kdevelop index 735f68e6b..e1c20183f 100644 --- a/src/linux/projectmDev10.kdevelop +++ b/src/linux/projectmDev10.kdevelop @@ -65,7 +65,7 @@ 0 false make - install + default diff --git a/src/projectM-engine/PresetChooser.hpp b/src/projectM-engine/PresetChooser.hpp index 290559bb7..4cd7cb5d3 100644 --- a/src/projectM-engine/PresetChooser.hpp +++ b/src/projectM-engine/PresetChooser.hpp @@ -108,6 +108,8 @@ private: }; +inline PresetChooser::PresetChooser(const PresetLoader & presetLoader):m_presetLoader(&presetLoader) {} + inline std::size_t PresetChooser::getNumPresets() const { return m_presetLoader->getNumPresets(); } @@ -169,6 +171,12 @@ inline std::auto_ptr PresetChooser::weightedRandom(const PresetInputs & } +inline std::auto_ptr PresetChooser::directoryIndex(std::size_t index, const PresetInputs & presetInputs, + PresetOutputs & presetOutputs) const { + + return m_presetLoader->loadPreset(index,presetInputs, presetOutputs); +} + template inline std::auto_ptr PresetChooser::doWeightedSample(WeightFunctor & weightFunctor, const PresetInputs & presetInputs, PresetOutputs & presetOutputs) {