[Amsn-commits] SF.net SVN: amsn: [9733] trunk/amsn/utils/TkCximage/TkCximage.dylib

[<tomhennigan@us...>]

Revision: 9733
          http://amsn.svn.sourceforge.net/amsn/?rev=9733&view=rev
Author:   tomhennigan
Date:     2008-04-13 15:43:55 -0700 (Sun, 13 Apr 2008)

Log Message:
-----------
Updated TkCximage dylib to reflect latest changes, and to use the new version of Cximage.

Modified Paths:
--------------
    trunk/amsn/utils/TkCximage/TkCximage.dylib

Modified: trunk/amsn/utils/TkCximage/TkCximage.dylib
===================================================================
(Binary files differ)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Amsn-commits] SF.net SVN: amsn: [9732] trunk/amsn/utils/TkCximage/src/CxImage

[<tomhennigan@us...>]

Revision: 9732
          http://amsn.svn.sourceforge.net/amsn/?rev=9732&view=rev
Author:   tomhennigan
Date:     2008-04-13 15:41:35 -0700 (Sun, 13 Apr 2008)

Log Message:
-----------
Avoid build errrors on systems where ntohl and ntohs are already defined.

Modified Paths:
--------------
    trunk/amsn/utils/TkCximage/src/CxImage/ximabmp.cpp
    trunk/amsn/utils/TkCximage/src/CxImage/ximage.h
    trunk/amsn/utils/TkCximage/src/CxImage/ximagif.cpp
    trunk/amsn/utils/TkCximage/src/CxImage/ximainfo.cpp
    trunk/amsn/utils/TkCximage/src/CxImage/ximatga.cpp

Modified: trunk/amsn/utils/TkCximage/src/CxImage/ximabmp.cpp
===================================================================
--- trunk/amsn/utils/TkCximage/src/CxImage/ximabmp.cpp	2008-04-13 19:50:24 UTC (rev 9731)
+++ trunk/amsn/utils/TkCximage/src/CxImage/ximabmp.cpp	2008-04-13 22:41:35 UTC (rev 9732)
@@ -26,9 +26,9 @@
 	hdr.bfReserved1 = hdr.bfReserved2 = 0;
 	hdr.bfOffBits = 14 /*sizeof(BITMAPFILEHEADER)*/ + head.biSize + GetPaletteSize();
 
-	hdr.bfType = ntohs(hdr.bfType); 
-	hdr.bfSize = ntohl(hdr.bfSize); 
-	hdr.bfOffBits = ntohl(hdr.bfOffBits); 
+	hdr.bfType = xima_ntohs(hdr.bfType); 
+	hdr.bfSize = xima_ntohl(hdr.bfSize); 
+	hdr.bfOffBits = xima_ntohl(hdr.bfOffBits); 
 
 #if CXIMAGE_SUPPORT_ALPHA
 	if (GetNumColors()==0 && AlphaIsValid()){
@@ -42,7 +42,7 @@
 
 		hdr.bfSize = infohdr.biSize + infohdr.biSizeImage + 14 /*sizeof(BITMAPFILEHEADER)*/;
 
-		hdr.bfSize = ntohl(hdr.bfSize);
+		hdr.bfSize = xima_ntohl(hdr.bfSize);
 		bihtoh(&infohdr);
 
 		// Write the file header
@@ -88,8 +88,8 @@
   cx_try {
 	if (hFile->Read(&bf,min(14,sizeof(bf)),1)==0) cx_throw("Not a BMP");
 
-	bf.bfSize = ntohl(bf.bfSize); 
-	bf.bfOffBits = ntohl(bf.bfOffBits); 
+	bf.bfSize = xima_ntohl(bf.bfSize); 
+	bf.bfOffBits = xima_ntohl(bf.bfOffBits); 
 
     if (bf.bfType != BFT_BITMAP) { //do we have a RC HEADER?
         bf.bfOffBits = 0L;

Modified: trunk/amsn/utils/TkCximage/src/CxImage/ximage.h
===================================================================
--- trunk/amsn/utils/TkCximage/src/CxImage/ximage.h	2008-04-13 19:50:24 UTC (rev 9731)
+++ trunk/amsn/utils/TkCximage/src/CxImage/ximage.h	2008-04-13 22:41:35 UTC (rev 9732)
@@ -717,8 +717,8 @@
 	static float HueToRGB(float n1,float n2, float hue);
 	void Bitfield2RGB(BYTE *src, DWORD redmask, DWORD greenmask, DWORD bluemask, BYTE bpp);
 	static int CompareColors(const void *elem1, const void *elem2);
-	short ntohs(const short word);
-	long ntohl(const long dword);
+	short xima_ntohs(const short word);
+	long xima_ntohl(const long dword);
 	void bihtoh(BITMAPINFOHEADER* bih);
 
 	void*				pDib; //contains the header, the palette, the pixels

Modified: trunk/amsn/utils/TkCximage/src/CxImage/ximagif.cpp
===================================================================
--- trunk/amsn/utils/TkCximage/src/CxImage/ximagif.cpp	2008-04-13 19:50:24 UTC (rev 9731)
+++ trunk/amsn/utils/TkCximage/src/CxImage/ximagif.cpp	2008-04-13 22:41:35 UTC (rev 9732)
@@ -34,8 +34,8 @@
 	if (strncmp(dscgif.header,"GIF8",4)!=0) return FALSE;
 
 	// Avoid Byte order problem with Mac <AMSN>
-	dscgif.scrheight = ntohs(dscgif.scrheight);
-	dscgif.scrwidth = ntohs(dscgif.scrwidth);
+	dscgif.scrheight = xima_ntohs(dscgif.scrheight);
+	dscgif.scrwidth = xima_ntohs(dscgif.scrwidth);
 
 	if (info.nEscape == -1) {
 		// Return output dimensions only
@@ -96,10 +96,10 @@
 				assert(sizeof(image) == 9);
 				fp->Read(&image,sizeof(image),1);
 				//avoid byte order problems with Solaris <candan> <AMSN>
-				image.l = ntohs(image.l);
-				image.t = ntohs(image.t);
-				image.w = ntohs(image.w);
-				image.h = ntohs(image.h);
+				image.l = xima_ntohs(image.l);
+				image.t = xima_ntohs(image.t);
+				image.w = xima_ntohs(image.w);
+				image.h = xima_ntohs(image.h);
 
 				if (((image.l + image.w) > dscgif.scrwidth)||((image.t + image.h) > dscgif.scrheight))
 					break;
@@ -305,7 +305,7 @@
 			if (bContinue) {
 				assert(sizeof(gifgce) == 4);
 				bContinue = (count == fp->Read(&gifgce, 1, sizeof(gifgce)));
-				gifgce.delaytime = ntohs(gifgce.delaytime); // Avoid Byte order problem with Mac <AMSN>
+				gifgce.delaytime = xima_ntohs(gifgce.delaytime); // Avoid Byte order problem with Mac <AMSN>
 				if (bContinue) {
 					info.nBkgndIndex  = (gifgce.flags & 0x1) ? gifgce.transpcolindex : -1;
 					info.dwFrameDelay = gifgce.delaytime;
@@ -563,10 +563,10 @@
 	gifgce.transpcolindex = (BYTE)info.nBkgndIndex;	   
 
 	//Invert byte order in case we use a byte order arch, then set it back <AMSN>
-	gifgce.delaytime = ntohs(gifgce.delaytime);
+	gifgce.delaytime = xima_ntohs(gifgce.delaytime);
 	fp->PutC(sizeof(gifgce));
 	fp->Write(&gifgce, sizeof(gifgce), 1);
-	gifgce.delaytime = ntohs(gifgce.delaytime);
+	gifgce.delaytime = xima_ntohs(gifgce.delaytime);
 
 	fp->PutC(0);
 	// TRK END
@@ -1250,10 +1250,10 @@
 				fp->Read(&image,sizeof(image),1);
 
 				//avoid byte order problems with Solaris <candan> <AMSN>
-				image.l = ntohs(image.l);
-				image.t = ntohs(image.t);
-				image.w = ntohs(image.w);
-				image.h = ntohs(image.h);
+				image.l = xima_ntohs(image.l);
+				image.t = xima_ntohs(image.t);
+				image.w = xima_ntohs(image.w);
+				image.h = xima_ntohs(image.h);
 
 				// in case of images with empty screen descriptor, give a last chance
 				if (dscgif->scrwidth==0 && dscgif->scrheight==0){

Modified: trunk/amsn/utils/TkCximage/src/CxImage/ximainfo.cpp
===================================================================
--- trunk/amsn/utils/TkCximage/src/CxImage/ximainfo.cpp	2008-04-13 19:50:24 UTC (rev 9731)
+++ trunk/amsn/utils/TkCximage/src/CxImage/ximainfo.cpp	2008-04-13 22:41:35 UTC (rev 9732)
@@ -717,13 +717,13 @@
 	return ppFrames[nFrame];
 }
 ////////////////////////////////////////////////////////////////////////////////
-short CxImage::ntohs(const short word)
+short CxImage::xima_ntohs(const short word)
 {
 	if (info.bLittleEndianHost) return word;
 	return ( (word & 0xff) << 8 ) | ( (word >> 8) & 0xff );
 }
 ////////////////////////////////////////////////////////////////////////////////
-long CxImage::ntohl(const long dword)
+long CxImage::xima_ntohl(const long dword)
 {
 	if (info.bLittleEndianHost) return dword;
 	return  ((dword & 0xff) << 24 ) | ((dword & 0xff00) << 8 ) |
@@ -732,17 +732,17 @@
 ////////////////////////////////////////////////////////////////////////////////
 void CxImage::bihtoh(BITMAPINFOHEADER* bih)
 {
-	bih->biSize = ntohl(bih->biSize);
-	bih->biWidth = ntohl(bih->biWidth);
-	bih->biHeight = ntohl(bih->biHeight);
-	bih->biPlanes = ntohs(bih->biPlanes);
-	bih->biBitCount = ntohs(bih->biBitCount);
-	bih->biCompression = ntohl(bih->biCompression);
-	bih->biSizeImage = ntohl(bih->biSizeImage);
-	bih->biXPelsPerMeter = ntohl(bih->biXPelsPerMeter);
-	bih->biYPelsPerMeter = ntohl(bih->biYPelsPerMeter);
-	bih->biClrUsed = ntohl(bih->biClrUsed);
-	bih->biClrImportant = ntohl(bih->biClrImportant);
+	bih->biSize = xima_ntohl(bih->biSize);
+	bih->biWidth = xima_ntohl(bih->biWidth);
+	bih->biHeight = xima_ntohl(bih->biHeight);
+	bih->biPlanes = xima_ntohs(bih->biPlanes);
+	bih->biBitCount = xima_ntohs(bih->biBitCount);
+	bih->biCompression = xima_ntohl(bih->biCompression);
+	bih->biSizeImage = xima_ntohl(bih->biSizeImage);
+	bih->biXPelsPerMeter = xima_ntohl(bih->biXPelsPerMeter);
+	bih->biYPelsPerMeter = xima_ntohl(bih->biYPelsPerMeter);
+	bih->biClrUsed = xima_ntohl(bih->biClrUsed);
+	bih->biClrImportant = xima_ntohl(bih->biClrImportant);
 }
 ////////////////////////////////////////////////////////////////////////////////
 /**

Modified: trunk/amsn/utils/TkCximage/src/CxImage/ximatga.cpp
===================================================================
--- trunk/amsn/utils/TkCximage/src/CxImage/ximatga.cpp	2008-04-13 19:50:24 UTC (rev 9731)
+++ trunk/amsn/utils/TkCximage/src/CxImage/ximatga.cpp	2008-04-13 22:41:35 UTC (rev 9732)
@@ -309,12 +309,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 void CxImageTGA::tga_toh(TGAHEADER* p)
 {
-    p->CmapIndex = ntohs(p->CmapIndex);
-    p->CmapLength = ntohs(p->CmapLength);
-    p->X_Origin = ntohs(p->X_Origin);
-    p->Y_Origin = ntohs(p->Y_Origin);
-    p->ImageWidth = ntohs(p->ImageWidth);
-    p->ImageHeight = ntohs(p->ImageHeight);
+    p->CmapIndex = xima_ntohs(p->CmapIndex);
+    p->CmapLength = xima_ntohs(p->CmapLength);
+    p->X_Origin = xima_ntohs(p->X_Origin);
+    p->Y_Origin = xima_ntohs(p->Y_Origin);
+    p->ImageWidth = xima_ntohs(p->ImageWidth);
+    p->ImageHeight = xima_ntohs(p->ImageHeight);
 }
 ////////////////////////////////////////////////////////////////////////////////
 #endif 	// CXIMAGE_SUPPORT_TGA


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Amsn-commits] SF.net SVN: amsn: [9731] trunk/amsn

[<kakaroto@us...>]

Revision: 9731
          http://amsn.svn.sourceforge.net/amsn/?rev=9731&view=rev
Author:   kakaroto
Date:     2008-04-13 12:50:24 -0700 (Sun, 13 Apr 2008)

Log Message:
-----------
add plenty of status_log in case something doesn't work

Modified Paths:
--------------
    trunk/amsn/gui.tcl
    trunk/amsn/sip.tcl

Modified: trunk/amsn/gui.tcl
===================================================================
--- trunk/amsn/gui.tcl	2008-04-13 19:49:59 UTC (rev 9730)
+++ trunk/amsn/gui.tcl	2008-04-13 19:50:24 UTC (rev 9731)
@@ -1625,7 +1625,9 @@
 	#////////////////////////////////////////////////////////////////////////////////
 	proc SIPCallInviteUser { email } {
 		set supports_sip 0
-			
+
+		status_log "CallInviteUser $email"
+
 		set clientid [::abook::getContactData $email clientid]
 		if { $clientid == "" } { set clientid 0 }
 		set msnc [expr 0x100000]
@@ -1634,8 +1636,10 @@
 		}
 
 		if {$supports_sip } {
+			status_log "User supports SIP"
 			::MSNSIP::InviteUser $email
 		} else {
+			status_log "User has no SIP flag"
 			SIPCallNoSIPFlag $email			
 		}
 	}
@@ -1712,6 +1716,8 @@
 
 	proc AcceptSIPCall { chatid sip callid } {
 
+		status_log "Accepting SIP call from $chatid"
+
 		set win_name [::ChatWindow::For $chatid]
 		if { [::ChatWindow::For $chatid] == 0} {
 			return 0
@@ -1736,6 +1742,8 @@
 
 	proc DeclineSIPCall { chatid sip callid } {
 
+		status_log "Rejecting SIP call from $chatid"
+
 		set win_name [::ChatWindow::For $chatid]
 		if { [::ChatWindow::For $chatid] == 0} {
 			return 0
@@ -1751,18 +1759,24 @@
 	}
 
 	proc HangupSIPCall { chatid sip callid } {
+		status_log "Hanging up SIP call"
+
 		SIPCallEnded $chatid $sip $callid
 
 		::MSNSIP::HangUp $sip $callid
 	}
 
 	proc CancelSIPCall { chatid sip callid} {
+		status_log "Canceling SIP invite"
+
 		DisableSIPButton $chatid siphangup$callid 
 
 		::MSNSIP::CancelCall $sip $callid
 	}
 
 	proc SIPInviteSent { chatid sip callid } {
+		status_log "SIP invite sent"
+
 		WinWrite $chatid "\n" green
 		WinWriteIcon $chatid greyline 3
 		WinWrite $chatid "\n" green
@@ -1775,6 +1789,8 @@
 	}
 
 	proc SIPCallEnded {chatid sip callid } {
+		status_log "SIP call ended"
+
 		SIPCallMessage $chatid [trans sipcallended]
 
 		DisableSIPButton $chatid siphangup$callid 
@@ -1783,6 +1799,8 @@
 	proc SIPCalleeAccepted { chatid sip callid } {
 		::ChatWindow::MakeFor $chatid
 
+		status_log "SIP callee accepted our call"
+
 		set win_name [::ChatWindow::For $chatid]
 		if { [::ChatWindow::For $chatid] == 0} {
 			return 0
@@ -1797,48 +1815,65 @@
 
 	proc SIPCalleeBusy { chatid sip callid } {
 
+		status_log "SIP callee is busy"
+
 		SIPCallMessage $chatid [trans sipcalleebusy]
 
 		DisableSIPButton $chatid siphangup$callid 
 	}
 
 	proc SIPCalleeDeclined { chatid sip callid } {
+		status_log "SIP callee declined our call"
+
 		SIPCallMessage $chatid [trans sipcalleedeclined]
 
 		DisableSIPButton $chatid siphangup$callid 
 	}
 
 	proc SIPCalleeClosed { chatid sip callid } {
+		status_log "SIP callee closed the call"
+
 		SIPCallMessage $chatid [trans sipcalleeclosed]
 
 		DisableSIPButton $chatid siphangup$callid 
 	}
 
 	proc SIPCalleeNoAnswer { chatid sip callid }  {
+		status_log "SIP user did not answer our call"
+
 		SIPCallMessage $chatid [trans sipcalleenoanswer]
 
 		DisableSIPButton $chatid siphangup$callid 
 	}
 
 	proc SIPCalleeUnavailable { chatid sip callid }  {
+		status_log "SIP user is currently unavailable"
+
 		SIPCallMessage $chatid [trans sipcalleeunavailable]
 
 		DisableSIPButton $chatid siphangup$callid 
 	}
 
 	proc SIPCallImpossible { chatid } {
+		status_log "SIP call is impossible.. no farsight utility found/working"
+
 		SIPCallMessage $chatid [trans sipcallimpossible]
 	}
 
 	proc SIPCallUnsupported { chatid } {
+		status_log "Received unsupported SIP call from $chatid"
+
 		SIPCallMessageCallBack $chatid [trans sipcallunsupported]
 	}
 
 	proc SIPCallNoSIPFlag { chatid } {
+		status_log "User $chatid has no SIP flag in his clientid"
 		SIPCallMessage $chatid [trans sipcallnosipflag]
 	}
 
 	proc SIPCallMissed { chatid {callid ""} } {
+		status_log "We missed a SIP call from $chatid"
+
 		SIPCallMessageCallBack $chatid [trans sipcallmissed [::abook::getDisplayNick $chatid]]
 		if {$callid != "" } {
 			DisableSIPButton $chatid sipyes$callid
@@ -1847,12 +1882,16 @@
 	}
 
 	proc SIPCallYouAreBusy { chatid } {
+		status_log "Trying to make multiple SIP calls"
+
 		SIPCallMessage $chatid [trans sipcallyouarebusy]
 	}
 
 
 	proc SIPCalleeCanceled { chatid sip callid } {
 
+		status_log "SIP callee canceled his invite"
+
 		set win_name [::ChatWindow::For $chatid]
 		if { [::ChatWindow::For $chatid] == 0} {
 			return 0

Modified: trunk/amsn/sip.tcl
===================================================================
--- trunk/amsn/sip.tcl	2008-04-13 19:49:59 UTC (rev 9730)
+++ trunk/amsn/sip.tcl	2008-04-13 19:50:24 UTC (rev 9731)
@@ -132,6 +132,7 @@
 	}
 
 	method Disconnected { } {
+		status_log "Got Disconnected from SIP"
 		if {$state != "" } {
 			if {$options(-error_handler) != "" } {
 				if {[catch {eval [linsert $options(-error_handler) end DISCONNECTED]} result]} {
@@ -242,6 +243,7 @@
 	method Register { {callbk ""} } {
 		$self Connect
 
+		status_log "SIP : Registering : $state"
 		if { $state == "REGISTERED" } {
 			if {$callbk != "" } {
 				if {[catch {eval $callbk} result]} {
@@ -269,6 +271,8 @@
 	}
 
 	method RegisterExpires { } {
+		status_log "SIP : Register expired"
+
 		after cancel [list $self RegisterExpires] 
 		set state ""
 		$self Register
@@ -279,7 +283,8 @@
 			set options(-registered_host) [lindex $response 3]
 
 			set state "REGISTERED"
-			#puts "registered"
+			
+			status_log "SIP : Registered"
 			set expires [$self GetHeader $headers "Expires"]
 			if {$expires != "" } {
 				after [expr {$expires * 1000}] [list $self RegisterExpires] 
@@ -293,7 +298,7 @@
 				}				
 			}
 		} else {
-			#puts "error on registration"
+			status_log "SIP :error on registration"
 			if {$options(-error_handler) != "" } {
 				if {[catch {eval [linsert $options(-error_handler) end REGISTRATION]} result]} {
 					bgerror $result
@@ -304,6 +309,8 @@
 
 
 	method Unregister { } {
+		status_log "SIP : Unregistering"
+
 		set auth "$options(-user):$options(-password)"
 		set auth [string map {"\n" "" } [base64::encode $auth]]
 
@@ -345,11 +352,12 @@
 	}
 
 	method InviteCB {msg sdp callbk} {
+		status_log "SIP : Sending Invite"
 		$self Send $msg "application/sdp" $sdp
 	}
 
 	method InviteResponse {callid callbk response headers body } {
-		#puts "Received INVITE response"
+		status_log "Received INVITE response"
 
 		# Answer with ACK to any INVITE response (200 ok, or call terminated, or busy..)
 		# Answer only to INVITE responses
@@ -482,6 +490,8 @@
 	}
 
 	method InviteRequestHandler {callid response headers body } {
+		status_log "SIP : InviteRequestHandler called "
+
 		if {[$self GetCommand $headers] == "ACK"} {
 			if {[catch {eval [linsert $options(-request_handler) end $callid ACK ""]} result]} {
 				bgerror $result
@@ -553,6 +563,8 @@
 				error "Unknown Status"
 			}
 		}
+		status_log "SIP : Answering Invite with status $status"
+
 		$self Send [$self BuildResponse $callid INVITE $status] $content_type $content
 		if {$status != 180 } {
 			if {[info exists trying_afterid($callid)] } {
@@ -1058,20 +1070,22 @@
 
 	method SocketReadable { } {
 		if { [eof $sock] } {
-			#puts "Socket $sock reached eof"
+			status_log "SIPSocket: $sock reached eof"
 			$self Disconnect
 			return
 		}
 
 		if {$state == "BODY" } {
 			set content_length [$options(-sipconnection) GetHeader $headers "Content-Length"]
-			if { [catch {set body [read $sock $content_length]}]} {
+			if { [catch {set body [read $sock $content_length]} res]} {
+				status_log "SIPSocket: Reading Body got error $res"
 				$self Disconnect
 				return
 			}
 			set done 1
 		} else {
-			if { [catch {set line [string trim [gets $sock]]}]} {
+			if { [catch {set line [string trim [gets $sock]]} res]} {
+				status_log "SIPSocket: Reading line got error $res"
 				$self Disconnect
 				return
 			}
@@ -1143,6 +1157,7 @@
 	}
 
 	method Closed { } {
+		status_log "Farsight : Closed"
 		$self Close
 		if {$options(-closed) != "" } {
 			if {[catch {eval $options(-closed)} result]} {
@@ -1154,7 +1169,8 @@
 	method Close { } {
 		if {$pipe != "" } {
 			catch {puts $pipe "EXIT"}
-			catch {close $pipe}
+			catch {close $pipe} res
+			status_log "Closed pipe : $res" red
 		}
 		set pipe ""
 		$self Reset
@@ -1222,17 +1238,25 @@
 
 	method Prepare { } {
 		$self Close
+
+		status_log "Farsight : Preparing"
+
 		set pipe [open "| ./utils/farsight/farsight user@... remote@..." r+]
 		fconfigure $pipe -buffering line
 		fileevent $pipe readable [list $self PipeReadable]
 	}
 
 	method Start { } {
+
+
 		if {$options(-enable_ice) == 0} {
 			set candidates $remote_candidates
 		} else {
 			set candidates $remote_ice_candidates
 		}
+
+		status_log "Farsight starting : $remote_candidates - $remote_codecs"
+
 		foreach candidate $candidates {
 			foreach {candidate_id component_id password transport qvalue ip port} $candidate break			
 			puts $pipe "REMOTE_CANDIDATE: $candidate_id $component_id $password $transport $qvalue $ip $port"
@@ -1248,13 +1272,21 @@
 	}
 
 	method PipeReadable { } {
+		status_log "Farsight : Pipe is now readable"
 		if { [eof $pipe] } {
+			status_log "Farsight : got eof"
 			$self Closed
 			return
 		}
 
-		set line [gets $pipe]
+		if { [catch {set line [gets $pipe]} res] } {
+			status_log "Farsight : read error : $res"
+			$self Closed
+			return
+		}
 
+		status_log "Farsight answering : $line"
+
 		if {[string first "LOCAL_CODEC: " $line] == 0} {
 			set codec [string range $line 13 end]
 			foreach {pt name rate} [split $codec " "] break
@@ -1282,6 +1314,8 @@
 		}
 	
 		if {$prepared == 0 && $codecs_done && $candidates_done } {
+			status_log "Farsight : Farsight is now prepared!"
+
 			set prepared 1
 
 			$self CandidatesToICE
@@ -1429,12 +1463,18 @@
 		variable sipconnections
 		global sso
 		if {![info exists sso] } {
+			status_log "MSNSIP : Creating SIP.. not authenticated"
 			return ""
 		}
+
+		status_log "MSNSIP : Creating SIP connection to $host"
+
 		set token [$sso GetSecurityTokenByName Voice]
 		set sip [SIPConnection create %AUTO% -user [::config::getKey login] -password [$token cget -ticket] -host $host]
 		$sip configure -error_handler [list ::MSNSIP::errorSIP $sip] -request_handler [list ::MSNSIP::requestSIP $sip]
 		lappend sipconnections $sip
+
+		status_log "MSNSIP : SIP connection created : $sip"
 		return $sip
 		
 	}
@@ -1450,6 +1490,7 @@
 
 		# if we do a '$sip destroy' here...  Tcl segfaults!!! :D
 
+		status_log "MSNSIP : Destroying $sip"
 		set idx [lsearch $sipconnections $sip]
 		if {$idx >= 0} {
 			set sipconnections [lreplace $sipconnections $idx $idx]
@@ -1466,10 +1507,12 @@
 	proc ReceivedInvite { ip } {
 		variable sipconnections
 
+		status_log "MSNSIP : Received SIP invite on $ip"
 		foreach sip $sipconnections {
 			if {[$sip cget -registered_host] == $ip } {
 				# Just in case we're connected but registration expired
 				# and the timer didn't re-register us..
+				status_log "MSNSIP : $sip already registered on $ip"
 				$sip RegisterExpires
 				return
 			}
@@ -1487,6 +1530,7 @@
 		if {$failed == 0 } {
 			eval $callback
 		}
+		# TODO : if can't auth for some reason.. signal the UI ?
 	}
 
 	proc SSOAuthenticate { callback } {
@@ -1496,6 +1540,7 @@
 	}
 
 	proc InviteUser { email } {
+		status_log "MSNSIP : Inviting user $email to a SIP call"
 		if {[$::farsight IsInUse] } {
 			# Signal the UI
 			::amsn::SIPCallYouAreBusy $email
@@ -1533,12 +1578,13 @@
 
 
 	proc inviteClosed { sip email callid {started 0}} {
+		status_log "MSNSIP : InviteClosed $sip $email $callid $started"
 		if {$started == 1} {
 			$sip Bye $callid
 
 			# Signal the UI
 			::amsn::SIPCallEnded $email $sip $callid
-		} elseif {$start == 0 } {
+		} elseif {$started == 0 } {
 			$sip Cancel $callid
 			
 			# Signal the UI
@@ -1552,17 +1598,19 @@
 	}
 
 	proc CancelCall { sip callid } {
+		status_log "MSNSIP : Canceling SIP call"
 		$sip Cancel $callid
 		destroySIP $sip		
 	}
 
 	proc HangUp { sip callid } {
+		status_log "MSNSIP : Hanging up SIP call"
 		$sip Bye $callid
 		destroySIP $sip
 	}
 
 	proc inviteSIPCB { sip email callid status detail} {
-		status_log "inviteSIPCB : $sip $email $callid $status" green
+		status_log "MSNSIP : inviteSIPCB : $sip $email $callid $status $detail" green
 		if { $status == "OK" } {
 			# Signal the UI
 			::amsn::SIPCalleeAccepted $email $sip $callid
@@ -1600,7 +1648,7 @@
 	}
 
 	proc requestSIP { sip callid what detail } {
-		status_log "requestSIP : $sip $callid $what" green
+		status_log "MSNSIP : requestSIP : $sip $callid $what" green
 		if {$what == "INVITE" } {
 			if {[$::farsight IsInUse] } {
 				# Signal the UI
@@ -1657,6 +1705,7 @@
 
 
 	proc answerClosed { sip callid {started 0}} {
+		status_log "MSNSIP: answerClosed : $sip $callid $started"
 		if {$started } {
 			# Signal the UI
 			::amsn::SIPCallEnded [$sip GetCaller $callid] $sip $callid
@@ -1672,6 +1721,8 @@
 	}
 
 	proc requestPrepared { sip callid } {
+		status_log "MSNSIP : request Prepared for $sip $callid"
+
 		# Signal the UI
 		::amsn::SIPCallReceived [$sip GetCaller $callid] $sip $callid
 
@@ -1679,11 +1730,15 @@
 	}
 
 	proc DeclineInvite {sip callid } {
+		status_log "MSNSIP: Declining invite"
+
 		$sip AnswerInvite $callid DECLINE
 		destroySIP $sip
 	}
 
 	proc AcceptInvite { sip callid } {
+		status_log "MSNSIP: Accepting invite"
+
 		# no prepare since it's already done before it started RINGING
 		$::farsight Start
 		$sip configure -local_candidates [$::farsight GetLocalCandidates]
@@ -1693,6 +1748,7 @@
 	}
 
 	proc errorSIP { sip reason } {
+		status_log "MSNSIP: Got an error"
 		# TODO : what use case where we need to signal the UI?
 		destroySIP $sip
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Amsn-commits] SF.net SVN: amsn: [9730] trunk/amsn

[<kakaroto@us...>]

Revision: 9730
          http://amsn.svn.sourceforge.net/amsn/?rev=9730&view=rev
Author:   kakaroto
Date:     2008-04-13 12:49:59 -0700 (Sun, 13 Apr 2008)

Log Message:
-----------
Add a check for glib 2.14

Modified Paths:
--------------
    trunk/amsn/configure
    trunk/amsn/configure.ac

Modified: trunk/amsn/configure
===================================================================
--- trunk/amsn/configure	2008-04-12 23:58:14 UTC (rev 9729)
+++ trunk/amsn/configure	2008-04-13 19:49:59 UTC (rev 9730)
@@ -697,6 +697,8 @@
 USE_MMX
 HAVE_PKGCONFIG
 PKG_CONFIG
+GLIB_CFLAGS
+GLIB_LIBS
 GST_CFLAGS
 GST_LIBS
 FARSIGHT2_CFLAGS
@@ -719,6 +721,8 @@
 XMKMF
 CPP
 PKG_CONFIG
+GLIB_CFLAGS
+GLIB_LIBS
 GST_CFLAGS
 GST_LIBS
 FARSIGHT2_CFLAGS
@@ -1319,6 +1323,8 @@
   XMKMF       Path to xmkmf, Makefile generator for X Window System
   CPP         C preprocessor
   PKG_CONFIG  path to pkg-config utility
+  GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config
+  GLIB_LIBS   linker flags for GLIB, overriding pkg-config
   GST_CFLAGS  C compiler flags for GST, overriding pkg-config
   GST_LIBS    linker flags for GST, overriding pkg-config
   FARSIGHT2_CFLAGS
@@ -6698,6 +6704,87 @@
 fi
 
 pkg_failed=no
+{ echo "$as_me:$LINENO: checking for GLIB" >&5
+echo $ECHO_N "checking for GLIB... $ECHO_C" >&6; }
+
+if test -n "$PKG_CONFIG"; then
+    if test -n "$GLIB_CFLAGS"; then
+        pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
+    glib-2.0 >= 2.14\"") >&5
+  ($PKG_CONFIG --exists --print-errors "\
+    glib-2.0 >= 2.14") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "\
+    glib-2.0 >= 2.14" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$GLIB_LIBS"; then
+        pkg_cv_GLIB_LIBS="$GLIB_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
+    glib-2.0 >= 2.14\"") >&5
+  ($PKG_CONFIG --exists --print-errors "\
+    glib-2.0 >= 2.14") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "\
+    glib-2.0 >= 2.14" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\
+    glib-2.0 >= 2.14"`
+        else
+	        GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\
+    glib-2.0 >= 2.14"`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$GLIB_PKG_ERRORS" >&5
+
+	{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+                HAVE_GLIB=no
+elif test $pkg_failed = untried; then
+	HAVE_GLIB=no
+else
+	GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
+	GLIB_LIBS=$pkg_cv_GLIB_LIBS
+        { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+	HAVE_GLIB=yes
+fi
+
+    if test "x$HAVE_GLIB" = "xyes"; then
+
+pkg_failed=no
 { echo "$as_me:$LINENO: checking for GST" >&5
 echo $ECHO_N "checking for GST... $ECHO_C" >&6; }
 
@@ -6707,14 +6794,14 @@
     else
         if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
-    gstreamer-\$GST_MAJORMINOR >= \$GST_REQUIRED\"") >&5
+      gstreamer-\$GST_MAJORMINOR >= \$GST_REQUIRED\"") >&5
   ($PKG_CONFIG --exists --print-errors "\
-    gstreamer-$GST_MAJORMINOR >= $GST_REQUIRED") 2>&5
+      gstreamer-$GST_MAJORMINOR >= $GST_REQUIRED") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_GST_CFLAGS=`$PKG_CONFIG --cflags "\
-    gstreamer-$GST_MAJORMINOR >= $GST_REQUIRED" 2>/dev/null`
+      gstreamer-$GST_MAJORMINOR >= $GST_REQUIRED" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -6728,14 +6815,14 @@
     else
         if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
-    gstreamer-\$GST_MAJORMINOR >= \$GST_REQUIRED\"") >&5
+      gstreamer-\$GST_MAJORMINOR >= \$GST_REQUIRED\"") >&5
   ($PKG_CONFIG --exists --print-errors "\
-    gstreamer-$GST_MAJORMINOR >= $GST_REQUIRED") 2>&5
+      gstreamer-$GST_MAJORMINOR >= $GST_REQUIRED") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_GST_LIBS=`$PKG_CONFIG --libs "\
-    gstreamer-$GST_MAJORMINOR >= $GST_REQUIRED" 2>/dev/null`
+      gstreamer-$GST_MAJORMINOR >= $GST_REQUIRED" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -6755,10 +6842,10 @@
 fi
         if test $_pkg_short_errors_supported = yes; then
 	        GST_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\
-    gstreamer-$GST_MAJORMINOR >= $GST_REQUIRED"`
+      gstreamer-$GST_MAJORMINOR >= $GST_REQUIRED"`
         else
 	        GST_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\
-    gstreamer-$GST_MAJORMINOR >= $GST_REQUIRED"`
+      gstreamer-$GST_MAJORMINOR >= $GST_REQUIRED"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GST_PKG_ERRORS" >&5
@@ -6776,7 +6863,7 @@
 	HAVE_GST=yes
 fi
 
-    if test "x$HAVE_GST" = "xyes"; then
+        if test "x$HAVE_GST" = "xyes"; then
 
 pkg_failed=no
 { echo "$as_me:$LINENO: checking for FARSIGHT2" >&5
@@ -6788,14 +6875,14 @@
     else
         if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
-           farsight2-\$GST_MAJORMINOR >= \$FARSIGHT_REQUIRED\"") >&5
+             farsight2-\$GST_MAJORMINOR >= \$FARSIGHT_REQUIRED\"") >&5
   ($PKG_CONFIG --exists --print-errors "\
-           farsight2-$GST_MAJORMINOR >= $FARSIGHT_REQUIRED") 2>&5
+             farsight2-$GST_MAJORMINOR >= $FARSIGHT_REQUIRED") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_FARSIGHT2_CFLAGS=`$PKG_CONFIG --cflags "\
-           farsight2-$GST_MAJORMINOR >= $FARSIGHT_REQUIRED" 2>/dev/null`
+             farsight2-$GST_MAJORMINOR >= $FARSIGHT_REQUIRED" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -6809,14 +6896,14 @@
     else
         if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
-           farsight2-\$GST_MAJORMINOR >= \$FARSIGHT_REQUIRED\"") >&5
+             farsight2-\$GST_MAJORMINOR >= \$FARSIGHT_REQUIRED\"") >&5
   ($PKG_CONFIG --exists --print-errors "\
-           farsight2-$GST_MAJORMINOR >= $FARSIGHT_REQUIRED") 2>&5
+             farsight2-$GST_MAJORMINOR >= $FARSIGHT_REQUIRED") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_FARSIGHT2_LIBS=`$PKG_CONFIG --libs "\
-           farsight2-$GST_MAJORMINOR >= $FARSIGHT_REQUIRED" 2>/dev/null`
+             farsight2-$GST_MAJORMINOR >= $FARSIGHT_REQUIRED" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -6836,10 +6923,10 @@
 fi
         if test $_pkg_short_errors_supported = yes; then
 	        FARSIGHT2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\
-           farsight2-$GST_MAJORMINOR >= $FARSIGHT_REQUIRED"`
+             farsight2-$GST_MAJORMINOR >= $FARSIGHT_REQUIRED"`
         else
 	        FARSIGHT2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\
-           farsight2-$GST_MAJORMINOR >= $FARSIGHT_REQUIRED"`
+             farsight2-$GST_MAJORMINOR >= $FARSIGHT_REQUIRED"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$FARSIGHT2_PKG_ERRORS" >&5
@@ -6856,8 +6943,8 @@
 echo "${ECHO_T}yes" >&6; }
 	HAVE_FARSIGHT=yes
 fi
+    fi
   fi
-
 fi
 
 
@@ -7569,6 +7656,8 @@
 USE_MMX!$USE_MMX$ac_delim
 HAVE_PKGCONFIG!$HAVE_PKGCONFIG$ac_delim
 PKG_CONFIG!$PKG_CONFIG$ac_delim
+GLIB_CFLAGS!$GLIB_CFLAGS$ac_delim
+GLIB_LIBS!$GLIB_LIBS$ac_delim
 GST_CFLAGS!$GST_CFLAGS$ac_delim
 GST_LIBS!$GST_LIBS$ac_delim
 FARSIGHT2_CFLAGS!$FARSIGHT2_CFLAGS$ac_delim
@@ -7578,7 +7667,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 91; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 93; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

Modified: trunk/amsn/configure.ac
===================================================================
--- trunk/amsn/configure.ac	2008-04-12 23:58:14 UTC (rev 9729)
+++ trunk/amsn/configure.ac	2008-04-13 19:49:59 UTC (rev 9730)
@@ -489,17 +489,23 @@
 
 dnl Give error and exit if we don't have pkgconfig
 if test "x$HAVE_PKGCONFIG" = "xyes"; then
-  PKG_CHECK_MODULES(GST, \
-    gstreamer-$GST_MAJORMINOR >= $GST_REQUIRED,
-    HAVE_GST=yes,HAVE_GST=no)
+  PKG_CHECK_MODULES(GLIB, \
+    glib-2.0 >= 2.14,
+    HAVE_GLIB=yes,HAVE_GLIB=no)
 
   dnl Give error and exit if we don't have gstreamer
-  if test "x$HAVE_GST" = "xyes"; then
-       PKG_CHECK_MODULES(FARSIGHT2, \
-           farsight2-$GST_MAJORMINOR >= $FARSIGHT_REQUIRED,
-          HAVE_FARSIGHT=yes,HAVE_FARSIGHT=no)
+  if test "x$HAVE_GLIB" = "xyes"; then
+    PKG_CHECK_MODULES(GST, \
+      gstreamer-$GST_MAJORMINOR >= $GST_REQUIRED,
+      HAVE_GST=yes,HAVE_GST=no)
+
+    dnl Give error and exit if we don't have gstreamer
+    if test "x$HAVE_GST" = "xyes"; then
+         PKG_CHECK_MODULES(FARSIGHT2, \
+             farsight2-$GST_MAJORMINOR >= $FARSIGHT_REQUIRED,
+            HAVE_FARSIGHT=yes,HAVE_FARSIGHT=no)
+    fi
   fi
-
 fi
 
 AC_SUBST(GST_CFLAGS)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.