mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-02-16 10:35:41 +00:00
Code Issues Projects Releases Wiki Activity

partial preset factory integration

Browse Source 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/represet@1137 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
w1z7ard
2008-09-07 16:35:30 +00:00
parent 3870526f3e
commit ece669b505
15 changed files with 303 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libprojectM/KeyHandler.cpp
View File

@ -168,7 +168,7 @@ void projectM::default_key_handler( projectMEvent event, projectMKeycode keycode
case PROJECTM_K_n:
m_presetChooser->nextPreset(*m_presetPos);
presetSwitchedEvent(true, **m_presetPos);
m_activePreset = m_presetPos->allocate(this->presetInputs, this->presetOutputs);
m_activePreset = m_presetPos->allocate();
renderer->SetPipeline(presetOutputs);
renderer->setPresetName(m_activePreset->name());
timeKeeper->StartPreset();
@ -181,7 +181,7 @@ void projectM::default_key_handler( projectMEvent event, projectMKeycode keycode
*m_presetPos = m_presetChooser->weightedRandom();
presetSwitchedEvent(true, **m_presetPos);
m_activePreset = m_presetPos->allocate(this->presetInputs, this->presetOutputs);
m_activePreset = m_presetPos->allocate();
renderer->SetPipeline(presetOutputs);
assert(m_activePreset.get());
@ -208,7 +208,7 @@ void projectM::default_key_handler( projectMEvent event, projectMKeycode keycode
--(*m_presetPos);
}
m_activePreset = m_presetPos->allocate(this->presetInputs, this->presetOutputs);
m_activePreset = m_presetPos->allocate();
renderer->SetPipeline(presetOutputs);
renderer->setPresetName(m_activePreset->name());