diff --git a/common/JackDriver.cpp b/common/JackDriver.cpp index 79aec599..682b6f78 100644 --- a/common/JackDriver.cpp +++ b/common/JackDriver.cpp @@ -172,7 +172,7 @@ bool JackDriver::IsRealTime() const void JackDriver::CycleIncTime() { - fEngineControl->CycleIncTime(fBeginDateUst); + fEngineControl->CycleIncTime(fBeginDateUst); } void JackDriver::CycleTakeBeginTime() diff --git a/common/JackNetInterface.cpp b/common/JackNetInterface.cpp index efd79fab..ce66488e 100644 --- a/common/JackNetInterface.cpp +++ b/common/JackNetInterface.cpp @@ -105,7 +105,7 @@ namespace Jack midi_size = fParams.fMtu * ( max ( fParams.fSendMidiChannels, fParams.fReturnMidiChannels ) * fParams.fPeriodSize * sizeof ( sample_t ) / ( fParams.fMtu - sizeof ( packet_header_t ) ) ); //bufsize = sync + audio + midi - bufsize = fParams.fMtu + ( int ) audio_size + ( int ) midi_size; + bufsize = 10 * (fParams.fMtu + ( int ) audio_size + ( int ) midi_size); //tx buffer if ( fSocket.SetOption ( SOL_SOCKET, SO_SNDBUF, &bufsize, sizeof ( bufsize ) ) == SOCKET_ERROR ) diff --git a/linux/alsa/JackAlsaDriver.cpp b/linux/alsa/JackAlsaDriver.cpp index 28190262..f46ca8af 100644 --- a/linux/alsa/JackAlsaDriver.cpp +++ b/linux/alsa/JackAlsaDriver.cpp @@ -1309,6 +1309,9 @@ JackAlsaDriver::alsa_driver_wait (alsa_driver_t *driver, int extra_fd, int *stat poll_ret = jack_get_microseconds (); + // steph + fBeginDateUst = poll_ret; + if (extra_fd < 0) { if (driver->poll_next && poll_ret > driver->poll_next) { *delayed_usecs = poll_ret - driver->poll_next;