Browse Source

Correct JackOSSAdapter thread scheduling, correct JackAudioAdapterInterface.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3430 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/1.9.2
sletz 16 years ago
parent
commit
bbaefaee7c
4 changed files with 12 additions and 10 deletions
  1. +1
    -1
      common/JackAudioAdapterInterface.cpp
  2. +2
    -6
      common/JackAudioAdapterInterface.h
  3. +0
    -1
      linux/alsa/JackAlsaAdapter.cpp
  4. +9
    -2
      solaris/oss/JackOSSAdapter.cpp

+ 1
- 1
common/JackAudioAdapterInterface.cpp View File

@@ -186,7 +186,7 @@ namespace Jack
fPlaybackRingBuffer = new JackResampler*[fPlaybackChannels]; fPlaybackRingBuffer = new JackResampler*[fPlaybackChannels];
if (fAdaptative) { if (fAdaptative) {
jack_info("Ringbuffer automatic adaptative mode");
jack_info("Ringbuffer automatic adaptative mode size = %d frames", fRingbufferCurSize);
} else { } else {
fRingbufferCurSize = DEFAULT_RB_SIZE; fRingbufferCurSize = DEFAULT_RB_SIZE;
jack_info("Fixed ringbuffer size = %d frames", fRingbufferCurSize); jack_info("Fixed ringbuffer size = %d frames", fRingbufferCurSize);


+ 2
- 6
common/JackAudioAdapterInterface.h View File

@@ -144,20 +144,16 @@ namespace Jack
virtual int SetHostBufferSize ( jack_nframes_t buffer_size ) virtual int SetHostBufferSize ( jack_nframes_t buffer_size )
{ {
fHostBufferSize = buffer_size; fHostBufferSize = buffer_size;
if (fAdaptative) {
if (fAdaptative)
AdaptRingBufferSize(); AdaptRingBufferSize();
ResetRingBuffers();
}
return 0; return 0;
} }


virtual int SetAdaptedBufferSize ( jack_nframes_t buffer_size ) virtual int SetAdaptedBufferSize ( jack_nframes_t buffer_size )
{ {
fAdaptedBufferSize = buffer_size; fAdaptedBufferSize = buffer_size;
if (fAdaptative) {
if (fAdaptative)
AdaptRingBufferSize(); AdaptRingBufferSize();
ResetRingBuffers();
}
return 0; return 0;
} }




+ 0
- 1
linux/alsa/JackAlsaAdapter.cpp View File

@@ -104,7 +104,6 @@ namespace Jack


//turn the thread realtime //turn the thread realtime
fThread.AcquireRealTime ( JackServerGlobals::fInstance->GetEngineControl()->fClientPriority ); fThread.AcquireRealTime ( JackServerGlobals::fInstance->GetEngineControl()->fClientPriority );

return 0; return 0;
} }




+ 9
- 2
solaris/oss/JackOSSAdapter.cpp View File

@@ -494,9 +494,16 @@ int JackOSSAdapter::Open()
} }


DisplayDeviceInfo(); DisplayDeviceInfo();

//start adapter thread
if (fThread.StartSync() < 0) {
jack_error ( "Cannot start audioadapter thread" );
return -1;
}
//turn the thread realtime
fThread.AcquireRealTime(JackServerGlobals::fInstance->GetEngineControl()->fClientPriority); fThread.AcquireRealTime(JackServerGlobals::fInstance->GetEngineControl()->fClientPriority);
return fThread.StartSync();
return 0;
error: error:
CloseAux(); CloseAux();


Loading…
Cancel
Save