diff --git a/common/JackAudioAdapter.cpp b/common/JackAudioAdapter.cpp index 59adc220..b9fc955b 100644 --- a/common/JackAudioAdapter.cpp +++ b/common/JackAudioAdapter.cpp @@ -22,6 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #include "JackError.h" #include "JackCompilerDeps.h" #include "JackTools.h" +#include "JackTime.h" #include "jslist.h" #include #include @@ -44,7 +45,7 @@ namespace Jack return 0; // DLL - adapter->fAudioAdapter->SetCallbackTime ( jack_get_time() ); + adapter->fAudioAdapter->SetCallbackTime (GetMicroSeconds()); // Push/pull from ringbuffer for ( i = 0; i < adapter->fCaptureChannels; i++ ) diff --git a/common/JackAudioAdapterInterface.cpp b/common/JackAudioAdapterInterface.cpp index fe9b00ef..b3401b03 100644 --- a/common/JackAudioAdapterInterface.cpp +++ b/common/JackAudioAdapterInterface.cpp @@ -18,6 +18,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "JackAudioAdapter.h" +#include "JackTime.h" #include namespace Jack @@ -107,7 +108,7 @@ namespace Jack void JackAudioAdapterInterface::ResampleFactor ( jack_nframes_t& frame1, jack_nframes_t& frame2 ) { - jack_time_t time = jack_get_time(); + jack_time_t time = GetMicroSeconds(); if ( !fRunning ) { diff --git a/common/JackNetManager.cpp b/common/JackNetManager.cpp index 95e0e802..16c2b777 100644 --- a/common/JackNetManager.cpp +++ b/common/JackNetManager.cpp @@ -397,7 +397,7 @@ namespace Jack int res = 0; #ifdef JACK_MONITOR - jack_time_t begin_time = jack_get_time(); + jack_time_t begin_time = GetMicroSeconds(); fNetTimeMon->New(); #endif @@ -426,7 +426,7 @@ namespace Jack return SOCKET_ERROR; #ifdef JACK_MONITOR - fNetTimeMon->Add ( ( ( ( float ) ( jack_get_time() - begin_time ) ) / ( float ) fPeriodUsecs ) * 100.f ); + fNetTimeMon->Add ( ( ( ( float ) (GetMicroSeconds() - begin_time ) ) / ( float ) fPeriodUsecs ) * 100.f ); #endif //send data @@ -434,7 +434,7 @@ namespace Jack return SOCKET_ERROR; #ifdef JACK_MONITOR - fNetTimeMon->Add ( ( ( ( float ) ( jack_get_time() - begin_time ) ) / ( float ) fPeriodUsecs ) * 100.f ); + fNetTimeMon->Add ( ( ( ( float ) (GetMicroSeconds() - begin_time ) ) / ( float ) fPeriodUsecs ) * 100.f ); #endif } else { @@ -447,7 +447,7 @@ namespace Jack return res; #ifdef JACK_MONITOR - fNetTimeMon->Add ( ( ( ( float ) ( jack_get_time() - begin_time ) ) / ( float ) fPeriodUsecs ) * 100.f ); + fNetTimeMon->Add ( ( ( ( float ) (GetMicroSeconds() - begin_time ) ) / ( float ) fPeriodUsecs ) * 100.f ); #endif //decode sync @@ -460,7 +460,7 @@ namespace Jack return res; #ifdef JACK_MONITOR - fNetTimeMon->AddLast ( ( ( ( float ) ( jack_get_time() - begin_time ) ) / ( float ) fPeriodUsecs ) * 100.f ); + fNetTimeMon->AddLast ( ( ( ( float ) (GetMicroSeconds() - begin_time ) ) / ( float ) fPeriodUsecs ) * 100.f ); #endif return 0; }