From a355e558a21c7b26b3e0673dc51fc19f88cae68a Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Tue, 29 Dec 2015 20:02:22 +0000
Subject: [PATCH] Safely revert last commit

---
 source/backend/engine/CarlaEngineBridge.cpp | 2 --
 source/jackbridge/JackBridge.hpp            | 2 +-
 source/jackbridge/JackBridge2.cpp           | 2 --
 source/jackbridge/JackBridge3.cpp           | 2 +-
 source/jackbridge/JackBridgeExport.cpp      | 2 --
 source/jackbridge/JackBridgeExport.hpp      | 4 ++--
 6 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/source/backend/engine/CarlaEngineBridge.cpp b/source/backend/engine/CarlaEngineBridge.cpp
index 36f9a6e84..74d0c1a37 100644
--- a/source/backend/engine/CarlaEngineBridge.cpp
+++ b/source/backend/engine/CarlaEngineBridge.cpp
@@ -1235,13 +1235,11 @@ protected:
                     break;
 
                 case kPluginBridgeRtClientSetAudioPool: {
-                    /*
                     if (fShmAudioPool.data != nullptr)
                     {
                         jackbridge_shm_unmap(fShmAudioPool.shm, fShmAudioPool.data);
                         fShmAudioPool.data = nullptr;
                     }
-                    */
                     const uint64_t poolSize(fShmRtClientControl.readULong());
                     CARLA_SAFE_ASSERT_BREAK(poolSize > 0);
                     fShmAudioPool.data = (float*)jackbridge_shm_map(fShmAudioPool.shm, static_cast<size_t>(poolSize));
diff --git a/source/jackbridge/JackBridge.hpp b/source/jackbridge/JackBridge.hpp
index 12d61c350..fce9fcf0b 100644
--- a/source/jackbridge/JackBridge.hpp
+++ b/source/jackbridge/JackBridge.hpp
@@ -404,6 +404,6 @@ JACKBRIDGE_API void  jackbridge_shm_init(void* shm) noexcept;
 JACKBRIDGE_API void  jackbridge_shm_attach(void* shm, const char* name) noexcept;
 JACKBRIDGE_API void  jackbridge_shm_close(void* shm) noexcept;
 JACKBRIDGE_API void* jackbridge_shm_map(void* shm, uint64_t size) noexcept;
-//JACKBRIDGE_API void  jackbridge_shm_unmap(void* shm, void* ptr) noexcept;
+JACKBRIDGE_API void  jackbridge_shm_unmap(void* shm, void* ptr) noexcept;
 
 #endif // JACKBRIDGE_HPP_INCLUDED
diff --git a/source/jackbridge/JackBridge2.cpp b/source/jackbridge/JackBridge2.cpp
index 879b7d76b..6194f85e6 100644
--- a/source/jackbridge/JackBridge2.cpp
+++ b/source/jackbridge/JackBridge2.cpp
@@ -114,7 +114,6 @@ void* jackbridge_shm_map(void* shm, uint64_t size) noexcept
 #endif
 }
 
-/*
 void jackbridge_shm_unmap(void* shm, void* ptr) noexcept
 {
     CARLA_SAFE_ASSERT_RETURN(shm != nullptr,);
@@ -123,6 +122,5 @@ void jackbridge_shm_unmap(void* shm, void* ptr) noexcept
     return carla_shm_unmap(*(carla_shm_t*)shm, ptr);
 #endif
 }
-*/
 
 // -----------------------------------------------------------------------------
diff --git a/source/jackbridge/JackBridge3.cpp b/source/jackbridge/JackBridge3.cpp
index 115bd1b95..bc494e889 100644
--- a/source/jackbridge/JackBridge3.cpp
+++ b/source/jackbridge/JackBridge3.cpp
@@ -135,7 +135,7 @@ const JackBridgeExportedFunctions* JACKBRIDGE_API jackbridge_get_exported_functi
     funcs.shm_attach_ptr                       = jackbridge_shm_attach;
     funcs.shm_close_ptr                        = jackbridge_shm_close;
     funcs.shm_map_ptr                          = jackbridge_shm_map;
-    //funcs.shm_unmap_ptr                        = jackbridge_shm_unmap;
+    funcs.shm_unmap_ptr                        = jackbridge_shm_unmap;
 
     funcs.unique1 = funcs.unique2 = funcs.unique3 = 0xdeadf00d;
 
diff --git a/source/jackbridge/JackBridgeExport.cpp b/source/jackbridge/JackBridgeExport.cpp
index c0d2337db..4a98ce0c6 100644
--- a/source/jackbridge/JackBridgeExport.cpp
+++ b/source/jackbridge/JackBridgeExport.cpp
@@ -578,11 +578,9 @@ void* jackbridge_shm_map(void* shm, uint64_t size) noexcept
     return getBridgeInstance().shm_map_ptr(shm, size);
 }
 
-/*
 void jackbridge_shm_unmap(void* shm, void* ptr) noexcept
 {
     return getBridgeInstance().shm_unmap_ptr(shm, ptr);
 }
-*/
 
 // -----------------------------------------------------------------------------
diff --git a/source/jackbridge/JackBridgeExport.hpp b/source/jackbridge/JackBridgeExport.hpp
index 05c8b0753..aec612724 100644
--- a/source/jackbridge/JackBridgeExport.hpp
+++ b/source/jackbridge/JackBridgeExport.hpp
@@ -118,7 +118,7 @@ typedef void (JACKBRIDGE_API *jackbridgesym_shm_init)(void*);
 typedef void (JACKBRIDGE_API *jackbridgesym_shm_attach)(void*, const char*);
 typedef void (JACKBRIDGE_API *jackbridgesym_shm_close)(void*);
 typedef void* (JACKBRIDGE_API *jackbridgesym_shm_map)(void*, uint64_t);
-//typedef void (JACKBRIDGE_API *jackbridgesym_shm_unmap)(void*, void*);
+typedef void (JACKBRIDGE_API *jackbridgesym_shm_unmap)(void*, void*);
 
 // -----------------------------------------------------------------------------
 
@@ -223,7 +223,7 @@ struct _JackBridgeExportedFunctions {
     jackbridgesym_shm_attach shm_attach_ptr;
     jackbridgesym_shm_close shm_close_ptr;
     jackbridgesym_shm_map shm_map_ptr;
-    //jackbridgesym_shm_unmap shm_unmap_ptr;
+    jackbridgesym_shm_unmap shm_unmap_ptr;
     ulong unique3;
 };