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

incrementally closer to buildable system

Browse Source 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/represet@1180 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
w1z7ard
2008-09-20 19:21:36 +00:00
parent da6dd94653
commit 71ce48bdcb
4 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/libprojectM/MilkdropPresetFactory/MilkdropPresetFactory.cpp
View File

@ -10,17 +10,6 @@
//
//
//
// C++ Interface: PresetFactory
//
// Description:
//
//
// Author: Carmelo Piccione <carmelo.piccione@gmail.com>, (C) 2008
//
// Copyright: See COPYING file that comes with this distribution
//
//
#include "MilkdropPresetFactory.hpp"
#include "MilkdropPreset.hpp"
#include "BuiltinFuncs.hpp"

7
src/libprojectM/MilkdropPresetFactory/MilkdropPresetFactory.hpp
View File

@ -14,8 +14,9 @@
#define __MILKDROP_PRESET_FACTORY_HPP
#include <memory>
#include "PresetFactory.hpp"
#include "PresetFrameIO.hpp"
#include "../PresetFactory.hpp"
class PresetOutputs;
class PresetInputs;
class MilkdropPresetFactory : public PresetFactory {
@ -33,7 +34,7 @@ public:
private:
void initializePresetOutputs(int gx, int gy);
void reset();
PresetOutputs _presetOutputs;
PresetOutputs * _presetOutputs;
//PresetInputs _presetInputs;
};

2
src/libprojectM/NativePresetFactory/NativePresetFactory.hpp
View File

@ -14,7 +14,7 @@
#define __NATIVE_PRESET_FACTORY_HPP
#include <memory>
#include "PresetFactory.hpp"
#include "../PresetFactory.hpp"
class PresetLibrary;

10
src/libprojectM/PresetFactoryManager.cpp
View File

@ -12,11 +12,11 @@
#include "PresetFactoryManager.hpp"
#ifndef DISABLE_MILKDROP_PRESETS
#include "MilkdropPresetFactory.hpp"
#include "MilkdropPresetFactory/MilkdropPresetFactory.hpp"
#endif
#ifndef DISABLE_COMPILED_PRESETS
#include "NativePresetFactory.hpp"
#ifndef DISABLE_NATIVE_PRESETS
#include "NativePresetFactory/NativePresetFactory.hpp"
#endif
#include <sstream>
@ -37,8 +37,8 @@ void PresetFactoryManager::initialize(int gx, int gy) {
factory = new MilkdropPresetFactory(_gx, _gy);
registerFactory(factory->supportedExtensions(), factory);
#endif
#ifndef DISABLE_COMPILED_PRESETS
#ifndef DISABLE_NATIVE_PRESETS
factory = new NativePresetFactory();
registerFactory(factory->supportedExtensions(), factory);
#endif