Browse Source

Rename `isSetUp` to `_setupComplete`

master
Krisjanis Rijnieks 10 years ago
parent
commit
2c63f5d86d
  1. 9
      src/ofxPiMapper.cpp
  2. 2
      src/ofxPiMapper.h

9
src/ofxPiMapper.cpp

@ -2,7 +2,7 @@
ofxPiMapper::ofxPiMapper(){ ofxPiMapper::ofxPiMapper(){
bShowInfo = false; bShowInfo = false;
isSetUp = false; _setupComplete = false;
_gui = new ofx::piMapper::SurfaceManagerGui(); _gui = new ofx::piMapper::SurfaceManagerGui();
_cmdManager = new ofx::piMapper::CmdManager(); _cmdManager = new ofx::piMapper::CmdManager();
_mediaServer = new ofx::piMapper::MediaServer(); _mediaServer = new ofx::piMapper::MediaServer();
@ -26,13 +26,14 @@ void ofxPiMapper::setup(){
} }
_gui->setSurfaceManager(_surfaceManager); _gui->setSurfaceManager(_surfaceManager);
isSetUp = true;
ofLogNotice("ofxPiMapper") << "Done setting up";
_application = new ofx::piMapper::Application(this); _application = new ofx::piMapper::Application(this);
_setupComplete = true;
ofLogNotice("ofxPiMapper") << "Setup complete";
} }
void ofxPiMapper::draw(){ void ofxPiMapper::draw(){
if(!isSetUp){ if(!_setupComplete){
return; return;
} }
_gui->draw(); _gui->draw();

2
src/ofxPiMapper.h

@ -36,7 +36,7 @@ class ofxPiMapper {
ofx::piMapper::Info * getInfo(); ofx::piMapper::Info * getInfo();
private: private:
bool isSetUp; bool _setupComplete;
bool bShowInfo; bool bShowInfo;
ofx::piMapper::CmdManager * _cmdManager; ofx::piMapper::CmdManager * _cmdManager;
ofx::piMapper::MediaServer * _mediaServer; ofx::piMapper::MediaServer * _mediaServer;

Loading…
Cancel
Save