Browse Source

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
tags/1.9.1
sletz 16 years ago
parent
commit
b2d7940247
3 changed files with 5 additions and 2 deletions
  1. +1
    -1
      common/JackDriver.cpp
  2. +1
    -1
      common/JackNetInterface.cpp
  3. +3
    -0
      linux/alsa/JackAlsaDriver.cpp

+ 1
- 1
common/JackDriver.cpp View File

@@ -172,7 +172,7 @@ bool JackDriver::IsRealTime() const

void JackDriver::CycleIncTime()
{
fEngineControl->CycleIncTime(fBeginDateUst);
fEngineControl->CycleIncTime(fBeginDateUst);
}

void JackDriver::CycleTakeBeginTime()


+ 1
- 1
common/JackNetInterface.cpp View File

@@ -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 )


+ 3
- 0
linux/alsa/JackAlsaDriver.cpp View File

@@ -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;


Loading…
Cancel
Save