OLD | NEW |
1 /* | 1 /* |
2 * libjingle | 2 * libjingle |
3 * Copyright 2014 Google Inc. | 3 * Copyright 2014 Google Inc. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions are met: | 6 * modification, are permitted provided that the following conditions are met: |
7 * | 7 * |
8 * 1. Redistributions of source code must retain the above copyright notice, | 8 * 1. Redistributions of source code must retain the above copyright notice, |
9 * this list of conditions and the following disclaimer. | 9 * this list of conditions and the following disclaimer. |
10 * 2. Redistributions in binary form must reproduce the above copyright notice, | 10 * 2. Redistributions in binary form must reproduce the above copyright notice, |
11 * this list of conditions and the following disclaimer in the documentation | 11 * this list of conditions and the following disclaimer in the documentation |
12 * and/or other materials provided with the distribution. | 12 * and/or other materials provided with the distribution. |
13 * 3. The name of the author may not be used to endorse or promote products | 13 * 3. The name of the author may not be used to endorse or promote products |
14 * derived from this software without specific prior written permission. | 14 * derived from this software without specific prior written permission. |
15 * | 15 * |
16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED | 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED |
17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | 17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF |
18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO | 18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO |
19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; | 21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; |
22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, | 22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, |
23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR | 23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR |
24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 */ | 26 */ |
27 | 27 |
28 #ifndef TALK_APP_WEBRTC_PEERCONNECTIONFACTORYPROXY_H_ | 28 #ifndef WEBRTC_API_PEERCONNECTIONFACTORYPROXY_H_ |
29 #define TALK_APP_WEBRTC_PEERCONNECTIONFACTORYPROXY_H_ | 29 #define WEBRTC_API_PEERCONNECTIONFACTORYPROXY_H_ |
30 | 30 |
31 #include <string> | 31 #include <string> |
32 #include <utility> | 32 #include <utility> |
33 | 33 |
34 #include "talk/app/webrtc/peerconnectioninterface.h" | 34 #include "webrtc/api/peerconnectioninterface.h" |
35 #include "talk/app/webrtc/proxy.h" | 35 #include "webrtc/api/proxy.h" |
36 #include "webrtc/base/bind.h" | 36 #include "webrtc/base/bind.h" |
37 | 37 |
38 namespace webrtc { | 38 namespace webrtc { |
39 | 39 |
40 BEGIN_PROXY_MAP(PeerConnectionFactory) | 40 BEGIN_PROXY_MAP(PeerConnectionFactory) |
41 PROXY_METHOD1(void, SetOptions, const Options&) | 41 PROXY_METHOD1(void, SetOptions, const Options&) |
42 // Can't use PROXY_METHOD5 because scoped_ptr must be moved. | 42 // Can't use PROXY_METHOD5 because scoped_ptr must be moved. |
43 // TODO(tommi,hbos): Use of templates to support scoped_ptr? | 43 // TODO(tommi,hbos): Use of templates to support scoped_ptr? |
44 rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection( | 44 rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection( |
45 const PeerConnectionInterface::RTCConfiguration& a1, | 45 const PeerConnectionInterface::RTCConfiguration& a1, |
(...skipping 30 matching lines...) Expand all Loading... |
76 PeerConnectionObserver* a5) { | 76 PeerConnectionObserver* a5) { |
77 rtc::scoped_ptr<cricket::PortAllocator> ptr_a3(a3); | 77 rtc::scoped_ptr<cricket::PortAllocator> ptr_a3(a3); |
78 rtc::scoped_ptr<DtlsIdentityStoreInterface> ptr_a4(a4); | 78 rtc::scoped_ptr<DtlsIdentityStoreInterface> ptr_a4(a4); |
79 return c_->CreatePeerConnection(a1, a2, std::move(ptr_a3), | 79 return c_->CreatePeerConnection(a1, a2, std::move(ptr_a3), |
80 std::move(ptr_a4), a5); | 80 std::move(ptr_a4), a5); |
81 } | 81 } |
82 END_PROXY() | 82 END_PROXY() |
83 | 83 |
84 } // namespace webrtc | 84 } // namespace webrtc |
85 | 85 |
86 #endif // TALK_APP_WEBRTC_PEERCONNECTIONFACTORYPROXY_H_ | 86 #endif // WEBRTC_API_PEERCONNECTIONFACTORYPROXY_H_ |
OLD | NEW |