Browse Source

Cleanup

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@1816 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/0.70
sletz 17 years ago
parent
commit
65989c7a5f
2 changed files with 11 additions and 9 deletions
  1. +5
    -3
      macosx/JackCoreAudioDriver.cpp
  2. +6
    -6
      macosx/JackCoreAudioDriver.h

+ 5
- 3
macosx/JackCoreAudioDriver.cpp View File

@@ -499,7 +499,7 @@ int JackCoreAudioDriver::SetupDevices(const char* capture_driver_uid, const char
return 0;
}

int JackCoreAudioDriver::SetupChannels(int capturing, int playing, int& inchannels, int& outchannels, int& in_nChannels, int& out_nChannels, bool strict)
int JackCoreAudioDriver::SetupChannels(bool capturing, bool playing, int& inchannels, int& outchannels, int& in_nChannels, int& out_nChannels, bool strict)
{
OSStatus err = noErr;
@@ -602,8 +602,8 @@ int JackCoreAudioDriver::SetupBufferSizeAndSampleRate(jack_nframes_t nframes, ja
return 0;
}

int JackCoreAudioDriver::OpenAUHAL(int capturing,
int playing,
int JackCoreAudioDriver::OpenAUHAL(bool capturing,
bool playing,
int inchannels,
int outchannels,
int in_nChannels,
@@ -616,6 +616,8 @@ int JackCoreAudioDriver::OpenAUHAL(int capturing,
UInt32 enableIO;
AudioStreamBasicDescription srcFormat, dstFormat;
JackLog("OpenAUHAL capturing = %ld playing = %ld playing = %ld outchannels = %ld in_nChannels = %ld out_nChannels = %ld \n", capturing, playing, inchannels, inchannels, in_nChannels, out_nChannels);
// AUHAL
ComponentDescription cd = {kAudioUnitType_Output, kAudioUnitSubType_HALOutput, kAudioUnitManufacturer_Apple, 0, 0};
Component HALOutput = FindNextComponent(NULL, &cd);


+ 6
- 6
macosx/JackCoreAudioDriver.h View File

@@ -68,8 +68,8 @@ class JackCoreAudioDriver : public JackAudioDriver
bool fState;
/// Intitial state
int fCapturing;
int fPlaying;
bool fCapturing;
bool fPlaying;
int fInChannels;
int fOutChannels;
@@ -120,8 +120,8 @@ class JackCoreAudioDriver : public JackAudioDriver
char* capture_driver_name,
char* playback_driver_name);
int SetupChannels(int capturing,
int playing,
int SetupChannels(bool capturing,
bool playing,
int& inchannels,
int& outchannels,
int& in_nChannels,
@@ -133,8 +133,8 @@ class JackCoreAudioDriver : public JackAudioDriver

int SetupBufferSizeAndSampleRate(jack_nframes_t nframes, jack_nframes_t samplerate);
int OpenAUHAL(int capturing,
int playing,
int OpenAUHAL(bool capturing,
bool playing,
int inchannels,
int outchannels,
int in_nChannels,


Loading…
Cancel
Save