Browse Source

Clean up `SurfaceManager`

master
Krisjanis Rijnieks 10 years ago
parent
commit
058eb23b13
  1. 4
      src/Surfaces/SurfaceManager.cpp
  2. 21
      src/Surfaces/SurfaceManager.h

4
src/Surfaces/SurfaceManager.cpp

@ -16,7 +16,6 @@ void SurfaceManager::draw(){
_surfaces.draw();
}
// Add existing surface
void SurfaceManager::addSurface(BaseSurface * surface){
_surfaces.push_back(surface);
}
@ -76,9 +75,8 @@ BaseSurface * SurfaceManager::selectSurface(int index){
if(index >= _surfaces.size()){
throw runtime_error("Surface index out of bounds.");
}
selectedSurface = _surfaces[index];
// notify that a new surface has been selected
selectedSurface = _surfaces[index];
ofSendMessage("surfaceSelected");
return selectedSurface;
}

21
src/Surfaces/SurfaceManager.h

@ -26,32 +26,29 @@ class SurfaceManager {
~SurfaceManager();
void draw();
void addSurface(BaseSurface * surface);
void removeSelectedSurface();
void removeSurface();
void clear();
void deselectSurface();
void saveXmlSettings(string fileName);
bool loadXmlSettings(string fileName);
void setMediaServer(MediaServer * newMediaServer);
void clear();
bool loadXmlSettings(string fileName);
BaseSurface * getSurface(int index);
int size();
BaseSurface * selectSurface(int index);
BaseSurface * selectSurface(BaseSurface * surface);
BaseSurface * getSelectedSurface();
void deselectSurface();
int size();
private:
vector <BaseSurface *> surfaces;
BaseSurface * selectedSurface;
ofxXmlSettings xmlSettings;
MediaServer * mediaServer;
SurfaceStack _surfaces;
};
} // namespace piMapper

Loading…
Cancel
Save