Commit 81277ae4 authored by sletz's avatar sletz
Browse files

In JackCoreAudioDriver, fix an issue when no value is given for input.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4043 0c269be4-1314-0410-8aa9-9f06e86f4224
parent 3ca30c3c
......@@ -32,6 +32,10 @@ Adrian Knoth
Jackdmp changes log
---------------------------
2010-08-25 Stephane Letz <letz@grame.fr>
* In JackCoreAudioDriver, fix an issue when no value is given for input.
2010-08-23 Stephane Letz <letz@grame.fr>
* Adrian Knoth fix for linux cycle.h (ticket 188).
......
......@@ -5642,7 +5642,14 @@
isa = PBXProject;
buildConfigurationList = 4B699DD5097D427F00A18468 /* Build configuration list for PBXProject "Jackdmp" */;
compatibilityVersion = "Xcode 2.4";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
English,
Japanese,
French,
German,
);
mainGroup = 08FB7794FE84155DC02AAC07 /* JackServer */;
projectDirPath = "";
projectRoot = "";
......
......@@ -1366,7 +1366,7 @@ int JackCoreAudioDriver::SetupBuffers(int inchannels)
// Prepare buffers
fJackInputData = (AudioBufferList*)malloc(sizeof(UInt32) + inchannels * sizeof(AudioBuffer));
fJackInputData->mNumberBuffers = inchannels;
for (int i = 0; i < fCaptureChannels; i++) {
for (int i = 0; i < inchannels; i++) {
fJackInputData->mBuffers[i].mNumberChannels = 1;
fJackInputData->mBuffers[i].mDataByteSize = fEngineControl->fBufferSize * sizeof(float);
}
......@@ -1478,11 +1478,6 @@ int JackCoreAudioDriver::Open(jack_nframes_t buffer_size,
char playback_driver_name[256];
// Keep initial state
fCapturing = capturing;
fPlaying = playing;
fInChannels = inchannels;
fOutChannels = outchannels;
fMonitor = monitor;
strcpy(fCaptureUID, capture_driver_uid);
strcpy(fPlaybackUID, playback_driver_uid);
fCaptureLatency = capture_latency;
......@@ -1946,7 +1941,7 @@ extern "C"
bool capture = false;
bool playback = false;
int chan_in = -1; // Default: if not explicitely set, then max possible will be used...
int chan_out = -1; // Default: if not explicitely set, then max possible will be used...
int chan_out = -1; // Default: if not explicitely set, then max possible will be used...
bool monitor = false;
const char* capture_driver_uid = "";
const char* playback_driver_uid = "";
......
......@@ -68,17 +68,9 @@ class JackCoreAudioDriver : public JackAudioDriver
bool fState;
bool fHogged;
// Initial state
bool fCapturing;
bool fPlaying;
int fInChannels;
int fOutChannels;
char fCaptureUID[256];
char fPlaybackUID[256];
bool fMonitor;
float fIOUsage;
float fComputationGrain;
bool fClockDriftCompensate;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment