tox jabber-tox.el,1.7,1.8

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/tox
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3652

Modified Files:
	jabber-tox.el 
Log Message:
Send content description in session-initiate


Index: jabber-tox.el
===================================================================
RCS file: /cvsroot/emacs-jabber/tox/jabber-tox.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- jabber-tox.el	16 Oct 2008 15:56:56 -0000	1.7
+++ jabber-tox.el	16 Oct 2008 16:24:08 -0000	1.8
@@ -157,10 +157,33 @@
 			      (initiator . ,(jabber-connection-jid jc))
 			      (sid . ,sid))
 			     (content
-			      ;; XXX: don't we need a content description here?  read the specs...
-			      ((creator . ,(jabber-connection-bare-jid jc))
+			      ((creator . "initiator")
 			       (name . "foo")
 			       (senders . "initiator"))
+			      (description 
+			       ((xmlns . ,jingle-rtp-ns)
+				(media . "audio"))
+			       ,@(mapcar 
+				  (lambda (codec)
+				    `(payload-type
+				      ((id . ,(number-to-string (nth 0 codec)))
+				       (name . ,(nth 1 codec))
+				       ;; (nth 2 codec) is media type;
+				       ;; should we filter out
+				       ;; non-audio codecs?  then
+				       ;; again, the value seems to be
+				       ;; bogus...
+				       (clockrate . ,(number-to-string (nth 3 codec)))
+				       ,@(let ((channels (nth 4 codec)))
+					   (unless (= channels 0)
+					     `((channels . ,(number-to-string channels))))))
+				      ,@(mapcar 
+					 (lambda (param)
+					   `(parameter
+					     ((name . ,(nth 0 param))
+					      (value . ,(nth 1 param)))))
+					 (nth 5 codec))))
+				  (plist-get state-data :our-codecs)))
 			      (transport ((xmlns . ,jingle-ice-udp-ns)))))
 		    (lambda (jc iq fsm)
 		      (fsm-send-sync fsm (cons :iq-result iq)))