From 899d11b58306e81fc5f2183c500c258834fe00d6 Mon Sep 17 00:00:00 2001
From: aymeric <aymeric@3f6dc0c8-ddfe-455d-9043-3cd528dc4637>
Date: Mon, 6 Jul 2009 15:33:57 +0000
Subject: [PATCH] fix for apple

git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@520 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
---
 linphone/mediastreamer2/src/macsnd.c   | 32 +++++++++++++++-----------
 linphone/mediastreamer2/src/mscommon.c |  8 +++++++
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/linphone/mediastreamer2/src/macsnd.c b/linphone/mediastreamer2/src/macsnd.c
index d4e3ac8eb..102a9f4a7 100644
--- a/linphone/mediastreamer2/src/macsnd.c
+++ b/linphone/mediastreamer2/src/macsnd.c
@@ -262,7 +262,7 @@ static void ca_set_source(MSSndCard *card, MSSndCardCapture source)
 
 static void ca_init(MSSndCard *card){
 	ms_debug("ca_init");
-	OSStatus err;
+	OSStatus result;
 	UInt32 param;
 	AudioDeviceID fInputDeviceID;
 	CAData *d=ms_new(CAData,1);
@@ -279,8 +279,8 @@ static void ca_init(MSSndCard *card){
 	Component comp = FindNextComponent(NULL, &desc);
 		if (comp == NULL) return;
 
-	err = OpenAComponent(comp, &d->caOutAudioUnit);
-	if(err != noErr) return;
+	result = OpenAComponent(comp, &d->caOutAudioUnit);
+	if(result != noErr) return;
 
 	// Get Default Input audio unit
 	desc.componentType = kAudioUnitType_Output;
@@ -292,8 +292,8 @@ static void ca_init(MSSndCard *card){
 	comp = FindNextComponent(NULL, &desc);
 		if (comp == NULL) return;
 
-	err = OpenAComponent(comp, &d->caInAudioUnit);
-	if(err != noErr) return;
+	result = OpenAComponent(comp, &d->caInAudioUnit);
+	if(result != noErr) return;
 
 	AudioUnitInitialize(d->caOutAudioUnit);
 	AudioUnitInitialize(d->caInAudioUnit);
@@ -303,19 +303,20 @@ static void ca_init(MSSndCard *card){
 	memset((char *)&d->caInASBD, 0, asbdsize);
 
 	// Setup Output audio unit
-	OSStatus result = AudioUnitGetProperty (d->caOutAudioUnit,
+	result = AudioUnitGetProperty (d->caOutAudioUnit,
 							kAudioUnitProperty_StreamFormat,
 							kAudioUnitScope_Output,
 							0,
 							&d->caOutASBD,
 							&asbdsize);
-
+	ms_message("AudioUnitGetProperty %i %x", result, result);
 	result = AudioUnitSetProperty (d->caOutAudioUnit,
 							kAudioUnitProperty_StreamFormat,
 							kAudioUnitScope_Input,
 							0,
 							&d->caOutASBD,
 							asbdsize);
+	ms_message("AudioUnitSetProperty %i %x", result, result);
 
 	// Setup Input audio unit
 	// Enable input on the AUHAL
@@ -326,13 +327,15 @@ static void ca_init(MSSndCard *card){
 							1,
 							&param,
 							sizeof(UInt32));
-
+	ms_message("AudioUnitSetProperty %i %x", result, result);
+	
 // Select the default input device
 	param = sizeof(AudioDeviceID);
 	result = AudioHardwareGetProperty(kAudioHardwarePropertyDefaultInputDevice,
 							&param,
 							&fInputDeviceID);
-
+	ms_message("AudioHardwareGetProperty %i %x", result, result);
+	
 	// Set the current device to the default input unit.
 	result = AudioUnitSetProperty(d->caInAudioUnit,
 							kAudioOutputUnitProperty_CurrentDevice,
@@ -340,7 +343,8 @@ static void ca_init(MSSndCard *card){
 							0,
 							&fInputDeviceID,
 							sizeof(AudioDeviceID));
-
+	ms_message("AudioUnitSetProperty %i %x", result, result);
+	
 	AudioStreamBasicDescription tmpASBD;
 	result = AudioUnitGetProperty (d->caInAudioUnit,
 							kAudioUnitProperty_StreamFormat,
@@ -348,6 +352,7 @@ static void ca_init(MSSndCard *card){
 							0,
 							&tmpASBD,
 							&asbdsize);
+	ms_message("AudioUnitGetProperty %i %x", result, result);
 	
 	int fAudioChannels = 1;
 	d->caInASBD.mChannelsPerFrame = fAudioChannels;
@@ -365,13 +370,14 @@ static void ca_init(MSSndCard *card){
 	d->caInASBD.mFramesPerPacket = 1;
 	d->caInASBD.mBytesPerPacket = d->caInASBD.mBytesPerFrame;
 
-	err = AudioUnitSetProperty(d->caInAudioUnit,
+	result = AudioUnitSetProperty(d->caInAudioUnit,
 							kAudioUnitProperty_StreamFormat,
 							kAudioUnitScope_Output,
 							1,
 							&d->caInASBD,
 							sizeof(AudioStreamBasicDescription));
-
+	ms_message("AudioUnitGetProperty %i %x", result, result);
+	
 	d->caSourceBuffer=NULL;
 
 	// Get the number of frames in the IO buffer(s)
@@ -383,7 +389,7 @@ static void ca_init(MSSndCard *card){
 							0,
 							&fAudioSamples,
 							&param);
-	if(err != noErr)
+	if(result != noErr)
 	{
 		fprintf(stderr, "failed to get audio sample size\n");
 		return;
diff --git a/linphone/mediastreamer2/src/mscommon.c b/linphone/mediastreamer2/src/mscommon.c
index 8ba416120..f6be18122 100644
--- a/linphone/mediastreamer2/src/mscommon.c
+++ b/linphone/mediastreamer2/src/mscommon.c
@@ -485,6 +485,10 @@ extern MSWebCamDesc ms_directx_cam_desc;
 extern MSWebCamDesc ms_dshow_cam_desc;
 #endif
 
+#ifdef __APPLE__
+extern MSWebCamDesc ms_v4m_cam_desc;
+#endif
+
 extern MSWebCamDesc static_image_desc;
 extern MSWebCamDesc mire_desc;
 
@@ -504,6 +508,10 @@ static MSWebCamDesc * ms_web_cam_descs[]={
 #ifdef __MINGW32__
 	&ms_dshow_cam_desc,
 #endif
+#ifdef __APPLE__
+	&ms_v4m_cam_desc,
+#endif
+
 	&mire_desc,
 	&static_image_desc,
 	NULL