Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(193)

Side by Side Diff: webrtc/pc/channelmanager.h

Issue 1783263002: Replace scoped_ptr with unique_ptr in webrtc/pc/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/pc/channel_unittest.cc ('k') | webrtc/pc/mediasession.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2004 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2004 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_PC_CHANNELMANAGER_H_ 11 #ifndef WEBRTC_PC_CHANNELMANAGER_H_
12 #define WEBRTC_PC_CHANNELMANAGER_H_ 12 #define WEBRTC_PC_CHANNELMANAGER_H_
13 13
14 #include <memory>
14 #include <string> 15 #include <string>
15 #include <vector> 16 #include <vector>
16 17
17 #include "webrtc/base/fileutils.h" 18 #include "webrtc/base/fileutils.h"
18 #include "webrtc/base/thread.h" 19 #include "webrtc/base/thread.h"
19 #include "webrtc/media/base/mediaengine.h" 20 #include "webrtc/media/base/mediaengine.h"
20 #include "webrtc/pc/voicechannel.h" 21 #include "webrtc/pc/voicechannel.h"
21 22
22 namespace webrtc { 23 namespace webrtc {
23 class MediaControllerInterface; 24 class MediaControllerInterface;
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 const std::string& content_name, 155 const std::string& content_name,
155 bool rtcp, 156 bool rtcp,
156 const VideoOptions& options); 157 const VideoOptions& options);
157 void DestroyVideoChannel_w(VideoChannel* video_channel); 158 void DestroyVideoChannel_w(VideoChannel* video_channel);
158 DataChannel* CreateDataChannel_w(TransportController* transport_controller, 159 DataChannel* CreateDataChannel_w(TransportController* transport_controller,
159 const std::string& content_name, 160 const std::string& content_name,
160 bool rtcp, 161 bool rtcp,
161 DataChannelType data_channel_type); 162 DataChannelType data_channel_type);
162 void DestroyDataChannel_w(DataChannel* data_channel); 163 void DestroyDataChannel_w(DataChannel* data_channel);
163 164
164 rtc::scoped_ptr<MediaEngineInterface> media_engine_; 165 std::unique_ptr<MediaEngineInterface> media_engine_;
165 rtc::scoped_ptr<DataEngineInterface> data_media_engine_; 166 std::unique_ptr<DataEngineInterface> data_media_engine_;
166 bool initialized_; 167 bool initialized_;
167 rtc::Thread* main_thread_; 168 rtc::Thread* main_thread_;
168 rtc::Thread* worker_thread_; 169 rtc::Thread* worker_thread_;
169 170
170 VoiceChannels voice_channels_; 171 VoiceChannels voice_channels_;
171 VideoChannels video_channels_; 172 VideoChannels video_channels_;
172 DataChannels data_channels_; 173 DataChannels data_channels_;
173 174
174 int audio_output_volume_; 175 int audio_output_volume_;
175 bool enable_rtx_; 176 bool enable_rtx_;
176 177
177 bool capturing_; 178 bool capturing_;
178 }; 179 };
179 180
180 } // namespace cricket 181 } // namespace cricket
181 182
182 #endif // WEBRTC_PC_CHANNELMANAGER_H_ 183 #endif // WEBRTC_PC_CHANNELMANAGER_H_
OLDNEW
« no previous file with comments | « webrtc/pc/channel_unittest.cc ('k') | webrtc/pc/mediasession.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698