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

Side by Side Diff: webrtc/api/mediastreamproxy.h

Issue 2663063003: Enable cpplint and fix cpplint errors in webrtc/api (Closed)
Patch Set: Enable cpplint and fix cpplint errors in webrtc/api Created 3 years, 10 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/api/mediaconstraintsinterface.cc ('k') | webrtc/api/mediastreamtrackproxy.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 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_API_MEDIASTREAMPROXY_H_ 11 #ifndef WEBRTC_API_MEDIASTREAMPROXY_H_
12 #define WEBRTC_API_MEDIASTREAMPROXY_H_ 12 #define WEBRTC_API_MEDIASTREAMPROXY_H_
13 13
14 #include <string>
15
14 #include "webrtc/api/mediastreaminterface.h" 16 #include "webrtc/api/mediastreaminterface.h"
15 #include "webrtc/api/proxy.h" 17 #include "webrtc/api/proxy.h"
16 18
17 namespace webrtc { 19 namespace webrtc {
18 20
19 BEGIN_SIGNALING_PROXY_MAP(MediaStream) 21 BEGIN_SIGNALING_PROXY_MAP(MediaStream)
20 PROXY_SIGNALING_THREAD_DESTRUCTOR() 22 PROXY_SIGNALING_THREAD_DESTRUCTOR()
21 PROXY_CONSTMETHOD0(std::string, label) 23 PROXY_CONSTMETHOD0(std::string, label)
22 PROXY_METHOD0(AudioTrackVector, GetAudioTracks) 24 PROXY_METHOD0(AudioTrackVector, GetAudioTracks)
23 PROXY_METHOD0(VideoTrackVector, GetVideoTracks) 25 PROXY_METHOD0(VideoTrackVector, GetVideoTracks)
24 PROXY_METHOD1(rtc::scoped_refptr<AudioTrackInterface>, 26 PROXY_METHOD1(rtc::scoped_refptr<AudioTrackInterface>,
25 FindAudioTrack, 27 FindAudioTrack,
26 const std::string&) 28 const std::string&)
27 PROXY_METHOD1(rtc::scoped_refptr<VideoTrackInterface>, 29 PROXY_METHOD1(rtc::scoped_refptr<VideoTrackInterface>,
28 FindVideoTrack, 30 FindVideoTrack,
29 const std::string&) 31 const std::string&)
30 PROXY_METHOD1(bool, AddTrack, AudioTrackInterface*) 32 PROXY_METHOD1(bool, AddTrack, AudioTrackInterface*)
31 PROXY_METHOD1(bool, AddTrack, VideoTrackInterface*) 33 PROXY_METHOD1(bool, AddTrack, VideoTrackInterface*)
32 PROXY_METHOD1(bool, RemoveTrack, AudioTrackInterface*) 34 PROXY_METHOD1(bool, RemoveTrack, AudioTrackInterface*)
33 PROXY_METHOD1(bool, RemoveTrack, VideoTrackInterface*) 35 PROXY_METHOD1(bool, RemoveTrack, VideoTrackInterface*)
34 PROXY_METHOD1(void, RegisterObserver, ObserverInterface*) 36 PROXY_METHOD1(void, RegisterObserver, ObserverInterface*)
35 PROXY_METHOD1(void, UnregisterObserver, ObserverInterface*) 37 PROXY_METHOD1(void, UnregisterObserver, ObserverInterface*)
36 END_PROXY_MAP() 38 END_PROXY_MAP()
37 39
38 } // namespace webrtc 40 } // namespace webrtc
39 41
40 #endif // WEBRTC_API_MEDIASTREAMPROXY_H_ 42 #endif // WEBRTC_API_MEDIASTREAMPROXY_H_
OLDNEW
« no previous file with comments | « webrtc/api/mediaconstraintsinterface.cc ('k') | webrtc/api/mediastreamtrackproxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698