Mercurial Mercurial > beem > jingle / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
doc/asmack-beem/beem_patches/50-jingle-ext.patch
author Nikita Kozlov <nikita@mbdsys.com>
Tue, 18 Jan 2011 00:26:02 +0100
changeset 868 6c2c4bfa43d0
parent 842 aa80be833fc6
permissions -rw-r--r--
Merge
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
840
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
     1
 
Index: org/jivesoftware/smackx/packet/JingleContentInfo.java
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
     2
 
===================================================================
842
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
     3
 
--- org/jivesoftware/smackx/packet/JingleContentInfo.java	(revision 11644)
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
     4
 
+++ org/jivesoftware/smackx/packet/JingleContentInfo.java	(working copy)
840
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
     5
 
@@ -96,7 +96,7 @@
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
     6
 
      */
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
     7
 
     public static class Audio extends JingleContentInfo {
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
     8
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
     9
 
-        public static final String NAMESPACE = "urn:xmpp:tmp:jingle:apps:rtp";
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    10
 
+        public static final String NAMESPACE = "urn:xmpp:jingle:apps:rtp:1";
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    11
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    12
 
         public Audio(final ContentInfo mi) {
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    13
 
             super(mi);
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    14
 
Index: org/jivesoftware/smackx/packet/JingleError.java
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    15
 
===================================================================
842
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
    16
 
--- org/jivesoftware/smackx/packet/JingleError.java	(revision 11644)
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
    17
 
+++ org/jivesoftware/smackx/packet/JingleError.java	(working copy)
840
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    18
 
@@ -27,7 +27,7 @@
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    19
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    20
 
 public class JingleError implements PacketExtension {
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    21
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    22
 
-    public static String NAMESPACE = "urn:xmpp:tmp:jingle:errors";
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    23
 
+    public static String NAMESPACE = "urn:xmpp:jingle:errors:1";
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    24
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    25
 
     public static final JingleError OUT_OF_ORDER = new JingleError("out-of-order");
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    26
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    27
 
Index: org/jivesoftware/smackx/packet/JingleTransport.java
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    28
 
===================================================================
842
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
    29
 
--- org/jivesoftware/smackx/packet/JingleTransport.java	(revision 11644)
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
    30
 
+++ org/jivesoftware/smackx/packet/JingleTransport.java	(working copy)
840
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    31
 
@@ -270,7 +270,7 @@
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    32
 
      * RTP-ICE profile
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    33
 
      */
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    34
 
     public static class Ice extends JingleTransport {
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    35
 
-        public static final String NAMESPACE = "urn:xmpp:tmp:jingle:transports:ice-udp";
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    36
 
+        public static final String NAMESPACE = "urn:xmpp:jingle:transports:ice-udp:1";
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    37
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    38
 
         public Ice() {
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    39
 
             super();
841
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
    40
 
@@ -352,7 +352,7 @@
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
    41
 
      * Raw UDP profile.
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
    42
 
      */
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
    43
 
     public static class RawUdp extends JingleTransport {
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
    44
 
-        public static final String NAMESPACE = "http://www.xmpp.org/extensions/xep-0177.html#ns";
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
    45
 
+        public static final String NAMESPACE = "urn:xmpp:jingle:transports:raw-udp:1";
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
    46
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
    47
 
         public RawUdp() {
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
    48
 
             super();
840
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    49
 
Index: org/jivesoftware/smackx/packet/JingleContentDescription.java
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    50
 
===================================================================
842
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
    51
 
--- org/jivesoftware/smackx/packet/JingleContentDescription.java	(revision 11644)
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
    52
 
+++ org/jivesoftware/smackx/packet/JingleContentDescription.java	(working copy)
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
    53
 
@@ -66,6 +66,13 @@
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
    54
 
     public abstract String getNamespace();
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
    55
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
    56
 
     /**
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
    57
 
+     * Return the media type.
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
    58
 
+     *
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
    59
 
+     * @return The media type
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
    60
 
+     */
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
    61
 
+    public abstract String getMediaType();
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
    62
 
+
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
    63
 
+    /**
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
    64
 
      * Adds a audio payload type to the packet.
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
    65
 
      *
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
    66
 
      * @param pt the audio payload type to add.
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
    67
 
@@ -153,7 +160,8 @@
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
    68
 
         synchronized (payloads) {
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
    69
 
             if (payloads.size() > 0) {
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
    70
 
                 buf.append("<").append(getElementName());
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
    71
 
-                buf.append(" xmlns=\"").append(getNamespace()).append("\" >");
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
    72
 
+                buf.append(" xmlns=\"").append(getNamespace()).append("\"");
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
    73
 
+                buf.append(" media=\"").append(getMediaType()).append("\" >");
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
    74
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
    75
 
                 Iterator pt = payloads.listIterator();
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
    76
 
                 while (pt.hasNext()) {
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
    77
 
@@ -172,7 +180,8 @@
840
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    78
 
      */
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    79
 
     public static class Audio extends JingleContentDescription {
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    80
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    81
 
-        public static final String NAMESPACE = "urn:xmpp:tmp:jingle:apps:rtp";
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    82
 
+        public static final String NAMESPACE = "urn:xmpp:jingle:apps:rtp:1";
842
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
    83
 
+        public static final String MEDIA_TYPE = "audio";
840
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    84
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    85
 
         public Audio() {
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    86
 
             super();
842
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
    87
 
@@ -189,6 +198,10 @@
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
    88
 
         public String getNamespace() {
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
    89
 
             return NAMESPACE;
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
    90
 
         }
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
    91
 
+
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
    92
 
+        public String getMediaType() {
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
    93
 
+            return MEDIA_TYPE;
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
    94
 
+        }
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
    95
 
     }
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
    96
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
    97
 
     /**
840
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    98
 
Index: org/jivesoftware/smackx/packet/Jingle.java
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
    99
 
===================================================================
842
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
   100
 
--- org/jivesoftware/smackx/packet/Jingle.java	(revision 11644)
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
   101
 
+++ org/jivesoftware/smackx/packet/Jingle.java	(working copy)
840
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
   102
 
@@ -44,7 +44,7 @@
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
   103
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
   104
 
     // static
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
   105
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
   106
 
-    public static final String NAMESPACE = "urn:xmpp:tmp:jingle";
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
   107
 
+    public static final String NAMESPACE = "urn:xmpp:jingle:1";
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
   108
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
   109
 
     public static final String NODENAME = "jingle";
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
   110
841
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
   111
 
Index: org/jivesoftware/smackx/packet/JingleDescription.java
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
   112
 
===================================================================
842
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
   113
 
--- org/jivesoftware/smackx/packet/JingleDescription.java	(revision 11644)
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
   114
 
+++ org/jivesoftware/smackx/packet/JingleDescription.java	(working copy)
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
   115
 
@@ -69,6 +69,13 @@
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
   116
 
     public abstract String getNamespace();
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
   117
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
   118
 
     /**
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
   119
 
+     * Return the media type.
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
   120
 
+     *
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
   121
 
+     * @return The media type
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
   122
 
+     */
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
   123
 
+    public abstract String getMediaType();
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
   124
 
+
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
   125
 
+    /**
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
   126
 
      * Adds a audio payload type to the packet.
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
   127
 
      *
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
   128
 
      * @param pt the audio payload type to add.
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
   129
 
@@ -160,7 +167,8 @@
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
   130
 
         synchronized (payloads) {
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
   131
 
             if (payloads.size() > 0) {
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
   132
 
                 buf.append("<").append(getElementName());
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
   133
 
-                buf.append(" xmlns=\"").append(getNamespace()).append("\" >");
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
   134
 
+                buf.append(" xmlns=\"").append(getNamespace()).append("\"");
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
   135
 
+                buf.append(" media=\"").append(getMediaType()).append("\" >");
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
   136
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
   137
 
                 for (PayloadType payloadType : payloads) {
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
   138
 
                     if (payloadType != null) {
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
   139
 
@@ -179,7 +187,8 @@
841
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
   140
 
      */
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
   141
 
     public static class Audio extends JingleDescription {
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
   142
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
   143
 
-        public static final String NAMESPACE = "urn:xmpp:tmp:jingle:apps:rtp";
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
   144
 
+        public static final String NAMESPACE = "urn:xmpp:jingle:apps:rtp:1";
842
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
   145
 
+        public static final String MEDIA_TYPE = "audio";
841
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
   146
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
   147
 
         public Audio() {
dfee4a6ffdad fix jingle raw-udp namespace name
Nikita Kozlov <nikita@mbdsys.com>
parents: 840
diff changeset 
   148
 
             super();
842
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
   149
 
@@ -196,5 +205,9 @@
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
   150
 
         public String getNamespace() {
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
   151
 
             return NAMESPACE;
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
   152
 
         }
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
   153
 
+
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
   154
 
+        public String getMediaType() {
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
   155
 
+            return MEDIA_TYPE;
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
   156
 
+        }
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
   157
 
     }
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
   158
 
 }
840
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
   159
 
Index: org/jivesoftware/smackx/jingle/JingleManager.java
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
   160
 
===================================================================
842
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
   161
 
--- org/jivesoftware/smackx/jingle/JingleManager.java	(revision 11644)
aa80be833fc6 adding a new patch for asmack for jingle support
Nikita Kozlov <nikita@beem-project.com>
parents: 841
diff changeset 
   162
 
+++ org/jivesoftware/smackx/jingle/JingleManager.java	(working copy)
840
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
   163
 
@@ -255,7 +255,7 @@
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
   164
 
      */
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
   165
 
     public static void setJingleServiceEnabled() {
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
   166
 
         ProviderManager providerManager = ProviderManager.getInstance();
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
   167
 
-        providerManager.addIQProvider("jingle", "urn:xmpp:tmp:jingle", new JingleProvider());
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
   168
 
+        providerManager.addIQProvider("jingle", "urn:xmpp:jingle:1", new JingleProvider());
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
   169
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
   170
 
         // Enable the Jingle support on every established connection
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
   171
 
         // The ServiceDiscoveryManager class should have been already
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
   172
 
@@ -598,4 +598,4 @@
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
   173
 
         }
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
   174
 
         return null;
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
   175
 
     }
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
   176
 
-}
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
   177
 
\ No newline at end of file
322071d17c00 merge beem-audio with trunk + some bugfix/improvements
Nikita Kozlov <nikita@mbdsys.com>
parents:
diff changeset 
   178
 
+}
BEEM-Jingle