Browse Source

Special commit without jackbridge_shm_unmap for early carla update

tags/1.9.7
falkTX 9 years ago
parent
commit
cbde6c8e01
6 changed files with 10 additions and 4 deletions
  1. +2
    -0
      source/backend/engine/CarlaEngineBridge.cpp
  2. +1
    -1
      source/jackbridge/JackBridge.hpp
  3. +2
    -0
      source/jackbridge/JackBridge2.cpp
  4. +1
    -1
      source/jackbridge/JackBridge3.cpp
  5. +2
    -0
      source/jackbridge/JackBridgeExport.cpp
  6. +2
    -2
      source/jackbridge/JackBridgeExport.hpp

+ 2
- 0
source/backend/engine/CarlaEngineBridge.cpp View File

@@ -1235,11 +1235,13 @@ 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));


+ 1
- 1
source/jackbridge/JackBridge.hpp View File

@@ -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

+ 2
- 0
source/jackbridge/JackBridge2.cpp View File

@@ -114,6 +114,7 @@ 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,);
@@ -122,5 +123,6 @@ void jackbridge_shm_unmap(void* shm, void* ptr) noexcept
return carla_shm_unmap(*(carla_shm_t*)shm, ptr);
#endif
}
*/

// -----------------------------------------------------------------------------

+ 1
- 1
source/jackbridge/JackBridge3.cpp View File

@@ -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;



+ 2
- 0
source/jackbridge/JackBridgeExport.cpp View File

@@ -578,9 +578,11 @@ 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);
}
*/

// -----------------------------------------------------------------------------

+ 2
- 2
source/jackbridge/JackBridgeExport.hpp View File

@@ -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;
};



Loading…
Cancel
Save