Commit b2d79402 authored by sletz's avatar sletz
Browse files

Correct timing measurement error done in ALSA driver (r3253)

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3258 0c269be4-1314-0410-8aa9-9f06e86f4224
parent ead2ee06
......@@ -172,7 +172,7 @@ bool JackDriver::IsRealTime() const
void JackDriver::CycleIncTime()
{
fEngineControl->CycleIncTime(fBeginDateUst);
fEngineControl->CycleIncTime(fBeginDateUst);
}
void JackDriver::CycleTakeBeginTime()
......
......@@ -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 )
......
......@@ -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;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment