From 058eb23b13dee33ca818880fcb88ddad8beaa14e Mon Sep 17 00:00:00 2001
From: Krisjanis Rijnieks <krisjanis.rijnieks@gmail.com>
Date: Tue, 12 Jan 2016 19:40:20 +0100
Subject: [PATCH] Clean up `SurfaceManager`

---
 src/Surfaces/SurfaceManager.cpp |  4 +---
 src/Surfaces/SurfaceManager.h   | 21 +++++++++------------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/Surfaces/SurfaceManager.cpp b/src/Surfaces/SurfaceManager.cpp
index f5359bb..503093e 100644
--- a/src/Surfaces/SurfaceManager.cpp
+++ b/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;
 }
diff --git a/src/Surfaces/SurfaceManager.h b/src/Surfaces/SurfaceManager.h
index 4093f96..c4a0f58 100644
--- a/src/Surfaces/SurfaceManager.h
+++ b/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