From 79d992760a390903ed996717cf616c5546f8cc38 Mon Sep 17 00:00:00 2001
From: Christian Berger <christian.berger@gu.se>
Date: Mon, 27 Jul 2015 10:20:46 -0700
Subject: [PATCH] * Revert to v1.5.0

---
 CaroloCup-CameraPlayback.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/CaroloCup-CameraPlayback.cpp b/CaroloCup-CameraPlayback.cpp
index db4364b..dc5b477 100644
--- a/CaroloCup-CameraPlayback.cpp
+++ b/CaroloCup-CameraPlayback.cpp
@@ -33,7 +33,7 @@
 #include <core/wrapper/SharedMemoryFactory.h>
 #include <tools/player/Player.h>
 
-#include <GeneratedHeaders_CoreData.h>
+#include <core/data/image/SharedImage.h>
 
 using namespace std;
 
@@ -41,7 +41,7 @@ using namespace std;
 using namespace core;
 using namespace core::base;
 using namespace core::data;
-using namespace coredata::image;
+using namespace core::data::image;
 using namespace core::io;
 using namespace core::wrapper;
 using namespace tools::player;
@@ -115,7 +115,7 @@ int32_t main(int32_t argc, char **argv) {
                 // Check if we could successfully attach to the shared memory.
                 if (sharedImageMemory->isValid()) {
                     // Using a shared lock to get exclusive access.
-                    Lock l(sharedImageMemory);
+                    sharedImageMemory->lock();
 
                     if (image == NULL) {
                         // Create the IplImage header data and access the shared memory for the actual image data. 
@@ -125,6 +125,8 @@ int32_t main(int32_t argc, char **argv) {
                         image->imageData = static_cast<char*>(sharedImageMemory->getSharedMemory());
                     }
 
+                    sharedImageMemory->unlock();
+
                     // Show the image using OpenCV.
                     cvShowImage("CaroloCup-CameraPlayback", image);