Browse Source

Move waiting code in JackAudioDriver::ProcessNull

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2499 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/1.90
sletz 17 years ago
parent
commit
1defef7359
3 changed files with 4 additions and 11 deletions
  1. +3
    -0
      common/JackAudioDriver.cpp
  2. +1
    -9
      common/JackNetDriver.cpp
  3. +0
    -2
      common/JackNetDriver.h

+ 3
- 0
common/JackAudioDriver.cpp View File

@@ -187,6 +187,9 @@ int JackAudioDriver::ProcessNull()
{
JackDriver::CycleTakeTime();
int wait_time = (int((float(fEngineControl->fBufferSize) / (float(fEngineControl->fSampleRate))) * 1000000.0f));
usleep(wait_time);
if (!fEngine->Process(fLastWaitUst)) // fLastWaitUst is set in the "low level" layer
jack_error("JackAudioDriver::ProcessNull Process error");
fGraphManager->ResumeRefNum(fClientControl, fSynchroTable);


+ 1
- 9
common/JackNetDriver.cpp View File

@@ -87,15 +87,7 @@ namespace Jack
return 0;
}
int JackNetDriver::ProcessNull()
{
JackDriver::CycleTakeTime();
int wait_time = (int((float(fEngineControl->fBufferSize) / (float(fEngineControl->fSampleRate))) * 1000000.0f));
usleep(wait_time);
return JackAudioDriver::ProcessNull();
}

bool JackNetDriver::Init()
bool JackNetDriver::Init()
{
jack_log ( "JackNetDriver::Init()" );
if ( fSockfd )


+ 0
- 2
common/JackNetDriver.h View File

@@ -78,8 +78,6 @@ namespace Jack
int Open ( jack_nframes_t frames_per_cycle, jack_nframes_t rate, bool capturing, bool playing,
int inchannels, int outchannels, bool monitor, const char* capture_driver_name,
const char* playback_driver_name, jack_nframes_t capture_latency, jack_nframes_t playback_latency );
int ProcessNull();
int Attach();
int Detach();


Loading…
Cancel
Save