| @@ -62,7 +62,13 @@ void JackGlobals::CheckContext(const char* name) | |||||
| JackGlobals::fStream = new std::ofstream(provstr, std::ios_base::ate); | JackGlobals::fStream = new std::ofstream(provstr, std::ios_base::ate); | ||||
| JackGlobals::fStream->is_open(); | JackGlobals::fStream->is_open(); | ||||
| } | } | ||||
| #ifdef PTHREAD_WIN32 /* Added by JE - 10-10-2011 */ | |||||
| (*fStream) << "JACK API call : " << name << ", calling thread : " << pthread_self().p << std::endl; | |||||
| #elif defined(WIN32) && !defined(__CYGWIN__) | |||||
| (*fStream) << "JACK API call : " << name << ", calling thread : " << GetCurrentThread() << std::endl; | |||||
| #else | |||||
| (*fStream) << "JACK API call : " << name << ", calling thread : " << pthread_self() << std::endl; | (*fStream) << "JACK API call : " << name << ", calling thread : " << pthread_self() << std::endl; | ||||
| #endif | |||||
| } | } | ||||
| #else | #else | ||||
| @@ -17,6 +17,11 @@ along with this program; if not, write to the Free Software | |||||
| Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | ||||
| */ | */ | ||||
| #if !defined(WIN32) || defined(__CYGWIN__) | |||||
| #ifdef PTHREAD_WIN32 // Added by JE - 13-02-2010 | |||||
| #include <ptw32/pthread.h> // Makes sure we #include the ptw32 version for | |||||
| #endif // consistency - even though we won't need it ! | |||||
| #include "JackConstants.h" | #include "JackConstants.h" | ||||
| #include "JackChannel.h" | #include "JackChannel.h" | ||||
| @@ -242,3 +247,4 @@ int try_start_server(jack_varargs_t* va, jack_options_t options, jack_status_t* | |||||
| return 0; | return 0; | ||||
| } | } | ||||
| #endif // !defined(WIN32) || defined(__CYGWIN__) | |||||
| @@ -40,7 +40,9 @@ | |||||
| #endif | #endif | ||||
| #if defined(_MSC_VER) /* Added by JE - 31-01-2012 */ | #if defined(_MSC_VER) /* Added by JE - 31-01-2012 */ | ||||
| #define vsnprintf _vsnprintf | |||||
| #define snprintf _snprintf | #define snprintf _snprintf | ||||
| #define strdup _strdup | |||||
| #endif | #endif | ||||
| #endif | #endif | ||||
| @@ -31,8 +31,9 @@ SERVER_EXPORT void JackSleep(long usec) | |||||
| SERVER_EXPORT void InitTime() | SERVER_EXPORT void InitTime() | ||||
| { | { | ||||
| QueryPerformanceFrequency(&_jack_freq); | |||||
| TIMECAPS caps; | TIMECAPS caps; | ||||
| QueryPerformanceFrequency(&_jack_freq); | |||||
| if (timeGetDevCaps(&caps, sizeof(TIMECAPS)) != TIMERR_NOERROR) { | if (timeGetDevCaps(&caps, sizeof(TIMECAPS)) != TIMERR_NOERROR) { | ||||
| jack_error("InitTime : could not get timer device"); | jack_error("InitTime : could not get timer device"); | ||||
| } else { | } else { | ||||