| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2011 The WebRTC Project Authors. All rights reserved. | 2 * Copyright 2011 The WebRTC Project Authors. All rights reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| 11 #ifndef WEBRTC_LIBJINGLE_XMPP_HANGOUTPUBSUBCLIENT_H_ | 11 #ifndef WEBRTC_LIBJINGLE_XMPP_HANGOUTPUBSUBCLIENT_H_ |
| 12 #define WEBRTC_LIBJINGLE_XMPP_HANGOUTPUBSUBCLIENT_H_ | 12 #define WEBRTC_LIBJINGLE_XMPP_HANGOUTPUBSUBCLIENT_H_ |
| 13 | 13 |
| 14 #include <map> | 14 #include <map> |
| 15 #include <memory> |
| 15 #include <string> | 16 #include <string> |
| 16 #include <vector> | 17 #include <vector> |
| 17 | 18 |
| 18 #include "webrtc/libjingle/xmpp/jid.h" | 19 #include "webrtc/libjingle/xmpp/jid.h" |
| 19 #include "webrtc/libjingle/xmpp/pubsubclient.h" | 20 #include "webrtc/libjingle/xmpp/pubsubclient.h" |
| 20 #include "webrtc/libjingle/xmpp/pubsubstateclient.h" | 21 #include "webrtc/libjingle/xmpp/pubsubstateclient.h" |
| 21 #include "webrtc/base/scoped_ptr.h" | 22 #include "webrtc/base/scoped_ptr.h" |
| 22 #include "webrtc/base/sigslot.h" | 23 #include "webrtc/base/sigslot.h" |
| 23 #include "webrtc/base/sigslotrepeater.h" | 24 #include "webrtc/base/sigslotrepeater.h" |
| 24 | 25 |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 156 const XmlElement* item, | 157 const XmlElement* item, |
| 157 const XmlElement* stanza); | 158 const XmlElement* stanza); |
| 158 void OnMediaBlockStateChange(const PubSubStateChange<bool>& change); | 159 void OnMediaBlockStateChange(const PubSubStateChange<bool>& change); |
| 159 void OnMediaBlockPublishResult(const std::string& task_id, | 160 void OnMediaBlockPublishResult(const std::string& task_id, |
| 160 const XmlElement* item); | 161 const XmlElement* item); |
| 161 void OnMediaBlockPublishError(const std::string& task_id, | 162 void OnMediaBlockPublishError(const std::string& task_id, |
| 162 const XmlElement* item, | 163 const XmlElement* item, |
| 163 const XmlElement* stanza); | 164 const XmlElement* stanza); |
| 164 Jid mucjid_; | 165 Jid mucjid_; |
| 165 std::string nick_; | 166 std::string nick_; |
| 166 rtc::scoped_ptr<PubSubClient> media_client_; | 167 std::unique_ptr<PubSubClient> media_client_; |
| 167 rtc::scoped_ptr<PubSubClient> presenter_client_; | 168 std::unique_ptr<PubSubClient> presenter_client_; |
| 168 rtc::scoped_ptr<PubSubStateClient<bool> > presenter_state_client_; | 169 std::unique_ptr<PubSubStateClient<bool> > presenter_state_client_; |
| 169 rtc::scoped_ptr<PubSubStateClient<bool> > audio_mute_state_client_; | 170 std::unique_ptr<PubSubStateClient<bool> > audio_mute_state_client_; |
| 170 rtc::scoped_ptr<PubSubStateClient<bool> > video_mute_state_client_; | 171 std::unique_ptr<PubSubStateClient<bool> > video_mute_state_client_; |
| 171 rtc::scoped_ptr<PubSubStateClient<bool> > video_pause_state_client_; | 172 std::unique_ptr<PubSubStateClient<bool> > video_pause_state_client_; |
| 172 rtc::scoped_ptr<PubSubStateClient<bool> > recording_state_client_; | 173 std::unique_ptr<PubSubStateClient<bool> > recording_state_client_; |
| 173 rtc::scoped_ptr<PubSubStateClient<bool> > media_block_state_client_; | 174 std::unique_ptr<PubSubStateClient<bool> > media_block_state_client_; |
| 174 }; | 175 }; |
| 175 | 176 |
| 176 } // namespace buzz | 177 } // namespace buzz |
| 177 | 178 |
| 178 #endif // WEBRTC_LIBJINGLE_XMPP_HANGOUTPUBSUBCLIENT_H_ | 179 #endif // WEBRTC_LIBJINGLE_XMPP_HANGOUTPUBSUBCLIENT_H_ |
| OLD | NEW |