Browse Source

Missing include, correct log message.

tags/v1.9.11-RC1
Stephane Letz 10 years ago
parent
commit
600bebe38d
2 changed files with 8 additions and 7 deletions
  1. +7
    -7
      common/JackShmMem.h
  2. +1
    -0
      macosx/coremidi/JackCoreMidiDriver.cpp

+ 7
- 7
common/JackShmMem.h View File

@@ -156,7 +156,7 @@ class JackShmReadWritePtr
void Init(int index, const char* server_name = JACK_DEFAULT_SERVER_NAME) void Init(int index, const char* server_name = JACK_DEFAULT_SERVER_NAME)
{ {
if (fInfo.index < 0 && index >= 0) { if (fInfo.index < 0 && index >= 0) {
jack_log("JackShmReadWritePtr::Init %ld %ld", index, fInfo.index);
jack_log("JackShmReadWritePtr::Init %ld %d", index, fInfo.index);
if (jack_initialize_shm(server_name) < 0) { if (jack_initialize_shm(server_name) < 0) {
throw std::bad_alloc(); throw std::bad_alloc();
} }
@@ -186,11 +186,11 @@ class JackShmReadWritePtr
~JackShmReadWritePtr() ~JackShmReadWritePtr()
{ {
if (!fInitDone) { if (!fInitDone) {
jack_error("JackShmReadWritePtr::~JackShmReadWritePtr - Init not done for %ld, skipping unlock", fInfo.index);
jack_error("JackShmReadWritePtr::~JackShmReadWritePtr - Init not done for %d, skipping unlock", fInfo.index);
return; return;
} }
if (fInfo.index >= 0) { if (fInfo.index >= 0) {
jack_log("JackShmReadWritePtr::~JackShmReadWritePtr %ld", fInfo.index);
jack_log("JackShmReadWritePtr::~JackShmReadWritePtr %d", fInfo.index);
GetShmAddress()->UnlockMemory(); GetShmAddress()->UnlockMemory();
jack_release_lib_shm(&fInfo); jack_release_lib_shm(&fInfo);
fInfo.index = -1; fInfo.index = -1;
@@ -245,7 +245,7 @@ class JackShmReadWritePtr1
void Init(int index, const char* server_name = JACK_DEFAULT_SERVER_NAME) void Init(int index, const char* server_name = JACK_DEFAULT_SERVER_NAME)
{ {
if (fInfo.index < 0 && index >= 0) { if (fInfo.index < 0 && index >= 0) {
jack_log("JackShmReadWritePtr1::Init %ld %ld", index, fInfo.index);
jack_log("JackShmReadWritePtr1::Init %ld %d", index, fInfo.index);
if (jack_initialize_shm(server_name) < 0) { if (jack_initialize_shm(server_name) < 0) {
throw std::bad_alloc(); throw std::bad_alloc();
} }
@@ -281,11 +281,11 @@ class JackShmReadWritePtr1
~JackShmReadWritePtr1() ~JackShmReadWritePtr1()
{ {
if (!fInitDone) { if (!fInitDone) {
jack_error("JackShmReadWritePtr1::~JackShmReadWritePtr1 - Init not done for %ld, skipping unlock", fInfo.index);
jack_error("JackShmReadWritePtr1::~JackShmReadWritePtr1 - Init not done for %d, skipping unlock", fInfo.index);
return; return;
} }
if (fInfo.index >= 0) { if (fInfo.index >= 0) {
jack_log("JackShmReadWritePtr1::~JackShmReadWritePtr1 %ld", fInfo.index);
jack_log("JackShmReadWritePtr1::~JackShmReadWritePtr1 %d", fInfo.index);
GetShmAddress()->UnlockMemory(); GetShmAddress()->UnlockMemory();
jack_release_lib_shm(&fInfo); jack_release_lib_shm(&fInfo);
fInfo.index = -1; fInfo.index = -1;
@@ -340,7 +340,7 @@ class JackShmReadPtr
void Init(int index, const char* server_name = JACK_DEFAULT_SERVER_NAME) void Init(int index, const char* server_name = JACK_DEFAULT_SERVER_NAME)
{ {
if (fInfo.index < 0 && index >= 0) { if (fInfo.index < 0 && index >= 0) {
jack_log("JackShmPtrRead::Init %ld %ld", index, fInfo.index);
jack_log("JackShmPtrRead::Init %ld %d", index, fInfo.index);
if (jack_initialize_shm(server_name) < 0) { if (jack_initialize_shm(server_name) < 0) {
throw std::bad_alloc(); throw std::bad_alloc();
} }


+ 1
- 0
macosx/coremidi/JackCoreMidiDriver.cpp View File

@@ -26,6 +26,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.


#include <stdexcept> #include <stdexcept>
#include <mach/mach_time.h> #include <mach/mach_time.h>
#include <mach/mach_error.h>


using Jack::JackCoreMidiDriver; using Jack::JackCoreMidiDriver;




Loading…
Cancel
Save