From a4614b7cb2d1f97d7e01433e50be4c10f9c97d29 Mon Sep 17 00:00:00 2001
From: Philipp Hancke <fippo@andyet.net>
Date: Sun, 22 Jun 2014 12:43:33 +0200
Subject: [PATCH] support both variants, js focus still sends "old" protocol

---
 libs/strophe/strophe.jingle.adapter.js     | 4 ++--
 libs/strophe/strophe.jingle.js             | 2 ++
 libs/strophe/strophe.jingle.sessionbase.js | 7 ++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/libs/strophe/strophe.jingle.adapter.js b/libs/strophe/strophe.jingle.adapter.js
index 670827e6e..9683f30ee 100644
--- a/libs/strophe/strophe.jingle.adapter.js
+++ b/libs/strophe/strophe.jingle.adapter.js
@@ -208,7 +208,7 @@ TraceablePeerConnection.prototype.addSource = function (elem) {
     $(elem).each(function (idx, content) {
         var name = $(content).attr('name');
         var lines = '';
-        tmp = $(content).find('>description>source[xmlns="urn:xmpp:jingle:apps:rtp:ssma:0"]');
+        tmp = $(content).find('source[xmlns="urn:xmpp:jingle:apps:rtp:ssma:0"]'); // can handle both >source and >description>source
         tmp.each(function () {
             var ssrc = $(this).attr('ssrc');
             if(mySdp.containsSSRC(ssrc)){
@@ -254,7 +254,7 @@ TraceablePeerConnection.prototype.removeSource = function (elem) {
     $(elem).each(function (idx, content) {
         var name = $(content).attr('name');
         var lines = '';
-        tmp = $(content).find('>description>source[xmlns="urn:xmpp:jingle:apps:rtp:ssma:0"]');
+        tmp = $(content).find('source[xmlns="urn:xmpp:jingle:apps:rtp:ssma:0"]'); // can handle both >source and >description>source
         tmp.each(function () {
             var ssrc = $(this).attr('ssrc');
             // This should never happen, but can be useful for bug detection
diff --git a/libs/strophe/strophe.jingle.js b/libs/strophe/strophe.jingle.js
index f99812246..21addf163 100644
--- a/libs/strophe/strophe.jingle.js
+++ b/libs/strophe/strophe.jingle.js
@@ -150,9 +150,11 @@ Strophe.addConnectionPlugin('jingle', {
                     $(document).trigger('unmute.jingle', [sess.sid, affected]);
                 }
                 break;
+            case 'addsource': // FIXME: proprietary, un-jingleish
             case 'source-add': // FIXME: proprietary
                 sess.addSource($(iq).find('>jingle>content'), fromJid);
                 break;
+            case 'removesource': // FIXME: proprietary, un-jingleish
             case 'source-remove': // FIXME: proprietary
                 sess.removeSource($(iq).find('>jingle>content'), fromJid);
                 break;
diff --git a/libs/strophe/strophe.jingle.sessionbase.js b/libs/strophe/strophe.jingle.sessionbase.js
index 35fa50aa3..4643bd0ee 100644
--- a/libs/strophe/strophe.jingle.sessionbase.js
+++ b/libs/strophe/strophe.jingle.sessionbase.js
@@ -156,7 +156,8 @@ SessionBase.prototype.sendSSRCUpdateIq = function(sdpMediaSsrcs, sid, initiator,
     var modify = $iq({to: toJid, type: 'set'})
         .c('jingle', {
             xmlns: 'urn:xmpp:jingle:1',
-            action: isAdd ? 'source-add' : 'source-remove',
+            //action: isAdd ? 'source-add' : 'source-remove', -- not yet
+            action: isAdd ? 'addsource' : 'removesource',
             initiator: initiator,
             sid: sid
         }
@@ -169,7 +170,7 @@ SessionBase.prototype.sendSSRCUpdateIq = function(sdpMediaSsrcs, sid, initiator,
         var channel = sdpMediaSsrcs[channelNum];
         modify.c('content', {name: channel.mediaType});
 
-        modify.c('description', {xmlns:'urn:xmpp:jingle:apps:rtp:1', media: channel.mediaType});
+        // modify.c('description', {xmlns:'urn:xmpp:jingle:apps:rtp:1', media: channel.mediaType}); -- not yet
         // FIXME: not completly sure this operates on blocks and / or handles different ssrcs correctly
         // generate sources from lines
         Object.keys(channel.ssrcs).forEach(function(ssrcNum) {
@@ -191,7 +192,7 @@ SessionBase.prototype.sendSSRCUpdateIq = function(sdpMediaSsrcs, sid, initiator,
             });
             modify.up(); // end of source
         });
-        modify.up(); // end of description
+        // modify.up(); // end of description -- not yet
         modify.up(); // end of content
     });
     if (modified) {