From 5bd3e53d4678ce9440f1768adffc68e7cb5596e2 Mon Sep 17 00:00:00 2001
From: Krisjanis Rijnieks <krisjanis.rijnieks@gmail.com>
Date: Sun, 3 Jan 2016 15:44:42 +0000
Subject: [PATCH] Make `MediaServer` a pointer in `ofxPiMapper` class

---
 src/ofxPiMapper.cpp | 11 ++++++-----
 src/ofxPiMapper.h   |  4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/ofxPiMapper.cpp b/src/ofxPiMapper.cpp
index b9e7b1f..f5b1a7f 100644
--- a/src/ofxPiMapper.cpp
+++ b/src/ofxPiMapper.cpp
@@ -3,14 +3,15 @@
 ofxPiMapper::ofxPiMapper(){
 	bShowInfo = false;
 	isSetUp = false;
+	_mediaServer = new ofx::piMapper::MediaServer();
 	_info = 0;
 }
 
 void ofxPiMapper::setup(){
 	ofLogNotice("ofxPiMapper") << "Setting up...";
 
-	surfaceManager.setMediaServer(&mediaServer);
-	gui.setMediaServer(&mediaServer);
+	surfaceManager.setMediaServer(_mediaServer);
+	gui.setMediaServer(_mediaServer);
 	gui.setCmdManager(&cmdManager);
 
 	if(!loadXmlSettings(PIMAPPER_USER_SURFACES_XML_FILE)){
@@ -38,7 +39,7 @@ void ofxPiMapper::draw(){
 }
 
 void ofxPiMapper::registerFboSource(ofx::piMapper::FboSource & fboSource){
-	mediaServer.addFboSource(fboSource);
+	_mediaServer->addFboSource(fboSource);
 }
 
 bool ofxPiMapper::loadXmlSettings(string fileName){
@@ -61,8 +62,8 @@ ofx::piMapper::SurfaceManagerGui & ofxPiMapper::getGui(){
 	return gui;
 }
 
-ofx::piMapper::MediaServer & ofxPiMapper::getMediaServer(){
-	return mediaServer;
+ofx::piMapper::MediaServer * ofxPiMapper::getMediaServer(){
+	return _mediaServer;
 }
 
 ofx::piMapper::SurfaceManager & ofxPiMapper::getSurfaceManager(){
diff --git a/src/ofxPiMapper.h b/src/ofxPiMapper.h
index 704fc9c..7666746 100644
--- a/src/ofxPiMapper.h
+++ b/src/ofxPiMapper.h
@@ -32,7 +32,7 @@ class ofxPiMapper {
 
 		ofx::piMapper::CmdManager & getCmdManager();
 		ofx::piMapper::SurfaceManagerGui & getGui();
-		ofx::piMapper::MediaServer & getMediaServer();
+		ofx::piMapper::MediaServer * getMediaServer();
 		ofx::piMapper::SurfaceManager & getSurfaceManager();
 		ofx::piMapper::CmdManager cmdManager;
 		ofx::piMapper::SurfaceManager surfaceManager;
@@ -41,7 +41,7 @@ class ofxPiMapper {
 	private:
 		bool isSetUp;
 		bool bShowInfo;
-		ofx::piMapper::MediaServer mediaServer;
+		ofx::piMapper::MediaServer * _mediaServer;
 		ofx::piMapper::SurfaceManagerGui gui;
 		ofx::piMapper::Application * _application;
 		ofx::piMapper::Info * _info;