diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/JackClient.cpp | 3 | ||||
| -rw-r--r-- | common/JackConstants.h | 2 | ||||
| -rw-r--r-- | common/JackMetadata.cpp | 6 |
3 files changed, 7 insertions, 4 deletions
diff --git a/common/JackClient.cpp b/common/JackClient.cpp index b03dbc25..43de6b3e 100644 --- a/common/JackClient.cpp +++ b/common/JackClient.cpp @@ -31,6 +31,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <math.h> #include <string> #include <algorithm> +#include <climits> using namespace std; @@ -636,7 +637,7 @@ inline int JackClient::CallProcessCallback() inline bool JackClient::WaitSync() { // Suspend itself: wait on the input synchro - if (GetGraphManager()->SuspendRefNum(GetClientControl(), fSynchroTable, 0x7FFFFFFF) < 0) { + if (GetGraphManager()->SuspendRefNum(GetClientControl(), fSynchroTable, LONG_MAX) < 0) { jack_error("SuspendRefNum error"); return false; } else { diff --git a/common/JackConstants.h b/common/JackConstants.h index 07f2ca4c..2c4ccf98 100644 --- a/common/JackConstants.h +++ b/common/JackConstants.h @@ -24,7 +24,7 @@ #include "config.h" #endif -#define VERSION "1.9.17" +#define VERSION "1.9.18" #define BUFFER_SIZE_MAX 8192 diff --git a/common/JackMetadata.cpp b/common/JackMetadata.cpp index 8cf00f32..ad2bdc93 100644 --- a/common/JackMetadata.cpp +++ b/common/JackMetadata.cpp @@ -123,9 +123,11 @@ int JackMetadata::PropertyInit() #endif if ((ret = fDBenv->open (fDBenv, dbpath, DB_CREATE | DB_INIT_LOCK | DB_INIT_MPOOL | DB_THREAD, 0)) != 0) { -#ifdef WIN32 +#if defined(WIN32) || defined(__APPLE__) // new versions of jack2 are built with HAVE_MIXED_SIZE_ADDRESSING, which induces this error, this is expected if (ret == DB_VERSION_MISMATCH) { + jack_error ("Failed to open previous DB environment, trying again clean..."); + // cleanup old stuff snprintf (dbpath, sizeof(dbpath), "%s/jack_db/metadata.db", fDBFilesDir); remove (dbpath); @@ -145,7 +147,7 @@ int JackMetadata::PropertyInit() if (ret != 0) #endif { - jack_error ("cannot open DB environment: %s", db_strerror (ret)); + jack_error ("Cannot open DB environment: %s", db_strerror (ret)); fDBenv = NULL; return -1; } |