From 8557a22607832dda77c3d286a635d569237f175b Mon Sep 17 00:00:00 2001
From: Jonas Zeunert <zeunert@rhrk.uni-kl.de>
Date: Tue, 4 Dec 2018 18:13:44 +0100
Subject: [PATCH] compiling'

---
 FlippR-Driver/src/GPIOInterface.cpp              |  3 ---
 FlippR-Driver/src/output/IOutputGPIOInterface.h  |  8 ++++----
 FlippR-Driver/src/output/OutputGPIOInterface.cpp |  5 +++++
 FlippR-Driver/src/output/OutputGPIOInterface.h   | 10 +++++-----
 FlippR-Driver/src/output/items/Sound.h           |  2 +-
 5 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/FlippR-Driver/src/GPIOInterface.cpp b/FlippR-Driver/src/GPIOInterface.cpp
index d3c2f5f..dac590e 100644
--- a/FlippR-Driver/src/GPIOInterface.cpp
+++ b/FlippR-Driver/src/GPIOInterface.cpp
@@ -14,8 +14,6 @@
 
 namespace flippR_driver
 {
-namespace utility
-{
 
 std::once_flag GPIOInterface::GPIO_LIB_INITIALIZED;
 
@@ -46,4 +44,3 @@ bool GPIOInterface::read_pin(char address)
 
 
 }
-}
diff --git a/FlippR-Driver/src/output/IOutputGPIOInterface.h b/FlippR-Driver/src/output/IOutputGPIOInterface.h
index 8cba5c9..c35915c 100644
--- a/FlippR-Driver/src/output/IOutputGPIOInterface.h
+++ b/FlippR-Driver/src/output/IOutputGPIOInterface.h
@@ -22,11 +22,11 @@ class IOutputGPIOInterface
 public:
   virtual ~IOutputGPIOInterface(){};
 
-  virtual void activate(output::items::IDriverBoardItem *driver_board_item) = 0;
-  virtual void activate(output::items::ISoundItem *sound) = 0;
+  virtual void activate(items::IDriverBoardItem *driver_board_item) = 0;
+  virtual void activate(items::ISoundItem *sound) = 0;
 
-  virtual void deactivate(output::items::IDriverBoardItem *driver_board_item) = 0;
-  virtual void deactivate(output::items::ISoundItem *sound) = 0;
+  virtual void deactivate(items::IDriverBoardItem *driver_board_item) = 0;
+  virtual void deactivate(items::ISoundItem *sound) = 0;
 
   virtual void write_display(std::shared_ptr<output::items::IDisplay> display) = 0;
   //Display gpio interface!
diff --git a/FlippR-Driver/src/output/OutputGPIOInterface.cpp b/FlippR-Driver/src/output/OutputGPIOInterface.cpp
index 620476f..f0b3485 100644
--- a/FlippR-Driver/src/output/OutputGPIOInterface.cpp
+++ b/FlippR-Driver/src/output/OutputGPIOInterface.cpp
@@ -141,5 +141,10 @@ void OutputGPIOInterface::fire_sound(bool fire)
   GPIOInterface::write_pin(pins_sound["fire"], fire);
 }
 
+void OutputGPIOInterface::write_display(std::shared_ptr<output::items::IDisplay> display)
+{
+  return;
+}
+
 }
 }
diff --git a/FlippR-Driver/src/output/OutputGPIOInterface.h b/FlippR-Driver/src/output/OutputGPIOInterface.h
index 15dfa73..fc76847 100644
--- a/FlippR-Driver/src/output/OutputGPIOInterface.h
+++ b/FlippR-Driver/src/output/OutputGPIOInterface.h
@@ -31,13 +31,13 @@ public:
 
   virtual ~OutputGPIOInterface() = default;
 
-  virtual void activate(output::items::IDriverBoardItem *driver_board_item);
-  virtual void activate(output::items::ISoundItem *sound);
+  void activate(items::IDriverBoardItem *driver_board_item) override;
+  void activate(items::ISoundItem *sound) override;
 
-  virtual void deactivate(output::items::IDriverBoardItem *driver_board_item);
-  virtual void deactivate(output::items::ISoundItem *sound);
+  void deactivate(items::IDriverBoardItem *driver_board_item) override;
+  void deactivate(items::ISoundItem *sound) override;
 
-  virtual void write_display(output::items::IDisplay *display);
+  void write_display(std::shared_ptr<output::items::IDisplay> display) override;
 
 private:
   void initialize_i2c_addresses();
diff --git a/FlippR-Driver/src/output/items/Sound.h b/FlippR-Driver/src/output/items/Sound.h
index aa40465..d7bce61 100644
--- a/FlippR-Driver/src/output/items/Sound.h
+++ b/FlippR-Driver/src/output/items/Sound.h
@@ -40,7 +40,7 @@ private:
 	std::chrono::milliseconds deactivation_time;
 
 	std::future<void> play_task;
-	
+
 private:
 	virtual void playTask();
 };