1 Index: org/jivesoftware/smackx/packet/JingleContentInfo.java |
1 Index: org/jivesoftware/smackx/packet/JingleContentInfo.java |
2 =================================================================== |
2 =================================================================== |
3 --- org/jivesoftware/smackx/packet/JingleContentInfo.java (révision 11644) |
3 --- org/jivesoftware/smackx/packet/JingleContentInfo.java (revision 11644) |
4 +++ org/jivesoftware/smackx/packet/JingleContentInfo.java (copie de travail) |
4 +++ org/jivesoftware/smackx/packet/JingleContentInfo.java (working copy) |
5 @@ -96,7 +96,7 @@ |
5 @@ -96,7 +96,7 @@ |
6 */ |
6 */ |
7 public static class Audio extends JingleContentInfo { |
7 public static class Audio extends JingleContentInfo { |
8 |
8 |
9 - public static final String NAMESPACE = "urn:xmpp:tmp:jingle:apps:rtp"; |
9 - public static final String NAMESPACE = "urn:xmpp:tmp:jingle:apps:rtp"; |
11 |
11 |
12 public Audio(final ContentInfo mi) { |
12 public Audio(final ContentInfo mi) { |
13 super(mi); |
13 super(mi); |
14 Index: org/jivesoftware/smackx/packet/JingleError.java |
14 Index: org/jivesoftware/smackx/packet/JingleError.java |
15 =================================================================== |
15 =================================================================== |
16 --- org/jivesoftware/smackx/packet/JingleError.java (révision 11644) |
16 --- org/jivesoftware/smackx/packet/JingleError.java (revision 11644) |
17 +++ org/jivesoftware/smackx/packet/JingleError.java (copie de travail) |
17 +++ org/jivesoftware/smackx/packet/JingleError.java (working copy) |
18 @@ -27,7 +27,7 @@ |
18 @@ -27,7 +27,7 @@ |
19 |
19 |
20 public class JingleError implements PacketExtension { |
20 public class JingleError implements PacketExtension { |
21 |
21 |
22 - public static String NAMESPACE = "urn:xmpp:tmp:jingle:errors"; |
22 - public static String NAMESPACE = "urn:xmpp:tmp:jingle:errors"; |
24 |
24 |
25 public static final JingleError OUT_OF_ORDER = new JingleError("out-of-order"); |
25 public static final JingleError OUT_OF_ORDER = new JingleError("out-of-order"); |
26 |
26 |
27 Index: org/jivesoftware/smackx/packet/JingleTransport.java |
27 Index: org/jivesoftware/smackx/packet/JingleTransport.java |
28 =================================================================== |
28 =================================================================== |
29 --- org/jivesoftware/smackx/packet/JingleTransport.java (révision 11644) |
29 --- org/jivesoftware/smackx/packet/JingleTransport.java (revision 11644) |
30 +++ org/jivesoftware/smackx/packet/JingleTransport.java (copie de travail) |
30 +++ org/jivesoftware/smackx/packet/JingleTransport.java (working copy) |
31 @@ -270,7 +270,7 @@ |
31 @@ -270,7 +270,7 @@ |
32 * RTP-ICE profile |
32 * RTP-ICE profile |
33 */ |
33 */ |
34 public static class Ice extends JingleTransport { |
34 public static class Ice extends JingleTransport { |
35 - public static final String NAMESPACE = "urn:xmpp:tmp:jingle:transports:ice-udp"; |
35 - public static final String NAMESPACE = "urn:xmpp:tmp:jingle:transports:ice-udp"; |
46 |
46 |
47 public RawUdp() { |
47 public RawUdp() { |
48 super(); |
48 super(); |
49 Index: org/jivesoftware/smackx/packet/JingleContentDescription.java |
49 Index: org/jivesoftware/smackx/packet/JingleContentDescription.java |
50 =================================================================== |
50 =================================================================== |
51 --- org/jivesoftware/smackx/packet/JingleContentDescription.java (révision 11644) |
51 --- org/jivesoftware/smackx/packet/JingleContentDescription.java (revision 11644) |
52 +++ org/jivesoftware/smackx/packet/JingleContentDescription.java (copie de travail) |
52 +++ org/jivesoftware/smackx/packet/JingleContentDescription.java (working copy) |
53 @@ -172,7 +172,7 @@ |
53 @@ -66,6 +66,13 @@ |
|
54 public abstract String getNamespace(); |
|
55 |
|
56 /** |
|
57 + * Return the media type. |
|
58 + * |
|
59 + * @return The media type |
|
60 + */ |
|
61 + public abstract String getMediaType(); |
|
62 + |
|
63 + /** |
|
64 * Adds a audio payload type to the packet. |
|
65 * |
|
66 * @param pt the audio payload type to add. |
|
67 @@ -153,7 +160,8 @@ |
|
68 synchronized (payloads) { |
|
69 if (payloads.size() > 0) { |
|
70 buf.append("<").append(getElementName()); |
|
71 - buf.append(" xmlns=\"").append(getNamespace()).append("\" >"); |
|
72 + buf.append(" xmlns=\"").append(getNamespace()).append("\""); |
|
73 + buf.append(" media=\"").append(getMediaType()).append("\" >"); |
|
74 |
|
75 Iterator pt = payloads.listIterator(); |
|
76 while (pt.hasNext()) { |
|
77 @@ -172,7 +180,8 @@ |
54 */ |
78 */ |
55 public static class Audio extends JingleContentDescription { |
79 public static class Audio extends JingleContentDescription { |
56 |
80 |
57 - public static final String NAMESPACE = "urn:xmpp:tmp:jingle:apps:rtp"; |
81 - public static final String NAMESPACE = "urn:xmpp:tmp:jingle:apps:rtp"; |
58 + public static final String NAMESPACE = "urn:xmpp:jingle:apps:rtp:1"; |
82 + public static final String NAMESPACE = "urn:xmpp:jingle:apps:rtp:1"; |
|
83 + public static final String MEDIA_TYPE = "audio"; |
59 |
84 |
60 public Audio() { |
85 public Audio() { |
61 super(); |
86 super(); |
|
87 @@ -189,6 +198,10 @@ |
|
88 public String getNamespace() { |
|
89 return NAMESPACE; |
|
90 } |
|
91 + |
|
92 + public String getMediaType() { |
|
93 + return MEDIA_TYPE; |
|
94 + } |
|
95 } |
|
96 |
|
97 /** |
62 Index: org/jivesoftware/smackx/packet/Jingle.java |
98 Index: org/jivesoftware/smackx/packet/Jingle.java |
63 =================================================================== |
99 =================================================================== |
64 --- org/jivesoftware/smackx/packet/Jingle.java (révision 11644) |
100 --- org/jivesoftware/smackx/packet/Jingle.java (revision 11644) |
65 +++ org/jivesoftware/smackx/packet/Jingle.java (copie de travail) |
101 +++ org/jivesoftware/smackx/packet/Jingle.java (working copy) |
66 @@ -44,7 +44,7 @@ |
102 @@ -44,7 +44,7 @@ |
67 |
103 |
68 // static |
104 // static |
69 |
105 |
70 - public static final String NAMESPACE = "urn:xmpp:tmp:jingle"; |
106 - public static final String NAMESPACE = "urn:xmpp:tmp:jingle"; |
72 |
108 |
73 public static final String NODENAME = "jingle"; |
109 public static final String NODENAME = "jingle"; |
74 |
110 |
75 Index: org/jivesoftware/smackx/packet/JingleDescription.java |
111 Index: org/jivesoftware/smackx/packet/JingleDescription.java |
76 =================================================================== |
112 =================================================================== |
77 --- org/jivesoftware/smackx/packet/JingleDescription.java (révision 11644) |
113 --- org/jivesoftware/smackx/packet/JingleDescription.java (revision 11644) |
78 +++ org/jivesoftware/smackx/packet/JingleDescription.java (copie de travail) |
114 +++ org/jivesoftware/smackx/packet/JingleDescription.java (working copy) |
79 @@ -179,7 +179,7 @@ |
115 @@ -69,6 +69,13 @@ |
|
116 public abstract String getNamespace(); |
|
117 |
|
118 /** |
|
119 + * Return the media type. |
|
120 + * |
|
121 + * @return The media type |
|
122 + */ |
|
123 + public abstract String getMediaType(); |
|
124 + |
|
125 + /** |
|
126 * Adds a audio payload type to the packet. |
|
127 * |
|
128 * @param pt the audio payload type to add. |
|
129 @@ -160,7 +167,8 @@ |
|
130 synchronized (payloads) { |
|
131 if (payloads.size() > 0) { |
|
132 buf.append("<").append(getElementName()); |
|
133 - buf.append(" xmlns=\"").append(getNamespace()).append("\" >"); |
|
134 + buf.append(" xmlns=\"").append(getNamespace()).append("\""); |
|
135 + buf.append(" media=\"").append(getMediaType()).append("\" >"); |
|
136 |
|
137 for (PayloadType payloadType : payloads) { |
|
138 if (payloadType != null) { |
|
139 @@ -179,7 +187,8 @@ |
80 */ |
140 */ |
81 public static class Audio extends JingleDescription { |
141 public static class Audio extends JingleDescription { |
82 |
142 |
83 - public static final String NAMESPACE = "urn:xmpp:tmp:jingle:apps:rtp"; |
143 - public static final String NAMESPACE = "urn:xmpp:tmp:jingle:apps:rtp"; |
84 + public static final String NAMESPACE = "urn:xmpp:jingle:apps:rtp:1"; |
144 + public static final String NAMESPACE = "urn:xmpp:jingle:apps:rtp:1"; |
|
145 + public static final String MEDIA_TYPE = "audio"; |
85 |
146 |
86 public Audio() { |
147 public Audio() { |
87 super(); |
148 super(); |
|
149 @@ -196,5 +205,9 @@ |
|
150 public String getNamespace() { |
|
151 return NAMESPACE; |
|
152 } |
|
153 + |
|
154 + public String getMediaType() { |
|
155 + return MEDIA_TYPE; |
|
156 + } |
|
157 } |
|
158 } |
88 Index: org/jivesoftware/smackx/jingle/JingleManager.java |
159 Index: org/jivesoftware/smackx/jingle/JingleManager.java |
89 =================================================================== |
160 =================================================================== |
90 --- org/jivesoftware/smackx/jingle/JingleManager.java (révision 11644) |
161 --- org/jivesoftware/smackx/jingle/JingleManager.java (revision 11644) |
91 +++ org/jivesoftware/smackx/jingle/JingleManager.java (copie de travail) |
162 +++ org/jivesoftware/smackx/jingle/JingleManager.java (working copy) |
92 @@ -255,7 +255,7 @@ |
163 @@ -255,7 +255,7 @@ |
93 */ |
164 */ |
94 public static void setJingleServiceEnabled() { |
165 public static void setJingleServiceEnabled() { |
95 ProviderManager providerManager = ProviderManager.getInstance(); |
166 ProviderManager providerManager = ProviderManager.getInstance(); |
96 - providerManager.addIQProvider("jingle", "urn:xmpp:tmp:jingle", new JingleProvider()); |
167 - providerManager.addIQProvider("jingle", "urn:xmpp:tmp:jingle", new JingleProvider()); |