Browse Source

Integrate SetActivePresetCmd into Application

master
Krisjanis Rijnieks 9 years ago
parent
commit
1a2070139d
  1. 6
      src/Application/Application.cpp
  2. 4
      src/Application/Application.h
  3. 2
      src/ofxPiMapper.cpp
  4. 1
      src/ofxPiMapper.h

6
src/Application/Application.cpp

@ -224,7 +224,11 @@ void Application::onCharacterReceived(KeyListenerEventData & e){
cout << "TermListener: " << e.character << endl;
onKeyPressed(args);
};
}
void Application::setActivePreset(unsigned int i){
_cmdManager.exec(new SetActivePresetCmd(this, i));
}
bool Application::loadXmlSettings(string fileName){
if(!ofFile::doesFileExist(fileName)){

4
src/Application/Application.h

@ -5,6 +5,7 @@
#include "SetApplicationModeCmd.h"
#include "ClearSurfacesCmd.h"
#include "SetActivePresetCmd.h"
#include "ApplicationBaseMode.h"
#include "PresentationMode.h"
@ -68,6 +69,9 @@ class Application : public KeyListener {
void onCharacterReceived(KeyListenerEventData & e);
TerminalListener consoleListener;
// Command executors
void setActivePreset(unsigned int i);
protected:
void setState(ApplicationBaseMode * st);

2
src/ofxPiMapper.cpp

@ -23,7 +23,7 @@ void ofxPiMapper::registerFboSource(ofx::piMapper::FboSource * fboSource){
}
void ofxPiMapper::setActivePreset(unsigned int i){
_application.getSurfaceManager()->setActivePreset(i);
_application.setActivePreset(i);
}
void ofxPiMapper::setNextPreset(){

1
src/ofxPiMapper.h

@ -38,6 +38,7 @@ class ofxPiMapper {
void registerFboSource(ofx::piMapper::FboSource & fboSource);
void registerFboSource(ofx::piMapper::FboSource * fboSource);
void setActivePreset(unsigned int i);
void setNextPreset();
void cloneActivePreset();

Loading…
Cancel
Save