Browse Source

Backends cleanup.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4077 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/1.9.7
sletz 14 years ago
parent
commit
f60680dd40
5 changed files with 8 additions and 9 deletions
  1. +2
    -2
      macosx/coreaudio/JackCoreAudioDriver.cpp
  2. +1
    -1
      posix/JackCompilerDeps_os.h
  3. +2
    -0
      solaris/oss/JackBoomerDriver.cpp
  4. +1
    -4
      solaris/oss/JackBoomerDriver.h
  5. +2
    -2
      solaris/oss/JackOSSDriver.cpp

+ 2
- 2
macosx/coreaudio/JackCoreAudioDriver.cpp View File

@@ -216,8 +216,8 @@ OSStatus JackCoreAudioDriver::Render(void *inRefCon,

int JackCoreAudioDriver::Read()
{
AudioUnitRender(fAUHAL, fActionFags, fCurrentTime, 1, fEngineControl->fBufferSize, fJackInputData);
return 0;
OSStatus err = AudioUnitRender(fAUHAL, fActionFags, fCurrentTime, 1, fEngineControl->fBufferSize, fJackInputData);
return (err == noErr) ? 0 : -1;
}

int JackCoreAudioDriver::Write()


+ 1
- 1
posix/JackCompilerDeps_os.h View File

@@ -48,7 +48,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#define SERVER_EXPORT __attribute__((visibility("default")))
#endif
#else
#define SERVER_EXPORT
#define SERVER_EXPORT __attribute__((visibility("hidden")))
#endif
#else
#define MEM_ALIGN(x,y) x


+ 2
- 0
solaris/oss/JackBoomerDriver.cpp View File

@@ -634,6 +634,7 @@ bool JackBoomerDriver::JackBoomerDriverInput::Init()
return true;
}

// TODO : better error handling
bool JackBoomerDriver::JackBoomerDriverInput::Execute()
{
@@ -721,6 +722,7 @@ bool JackBoomerDriver::JackBoomerDriverOutput::Init()
return true;
}

// TODO : better error handling
bool JackBoomerDriver::JackBoomerDriverOutput::Execute()
{
memset(fDriver->fOutputBuffer, 0, fDriver->fOutputBufferSize);


+ 1
- 4
solaris/oss/JackBoomerDriver.h View File

@@ -152,10 +152,7 @@ class JackBoomerDriver : public JackAudioDriver
}

int SetBufferSize(jack_nframes_t buffer_size);
bool Init();
bool Execute();

};

} // end of namespace


+ 2
- 2
solaris/oss/JackOSSDriver.cpp View File

@@ -707,7 +707,7 @@ int JackOSSDriver::ProcessSync()
// Read input buffers for the current cycle
if (Read() < 0) {
jack_error("ProcessSync: read error, skip cycle");
return 0; // Skip cycle, but continue processing...
return 0; // Non fatal error here, skip cycle, but continue processing...
}

if (fIsMaster) {
@@ -719,7 +719,7 @@ int JackOSSDriver::ProcessSync()
// Write output buffers for the current cycle
if (Write() < 0) {
jack_error("JackAudioDriver::ProcessSync: write error, skip cycle");
return 0; // Skip cycle, but continue processing...
return 0; // Non fatal error here, skip cycle, but continue processing...
}
return 0;


Loading…
Cancel
Save