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

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

Issue 1921653002: Enable -Winconsistent-missing-override flag. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase. Created 4 years, 7 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/java/jni/peerconnection_jni.cc ('k') | webrtc/api/peerconnectionfactory.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
(...skipping 13 matching lines...) Expand all
24 class MediaStream : public Notifier<MediaStreamInterface> { 24 class MediaStream : public Notifier<MediaStreamInterface> {
25 public: 25 public:
26 static rtc::scoped_refptr<MediaStream> Create(const std::string& label); 26 static rtc::scoped_refptr<MediaStream> Create(const std::string& label);
27 27
28 std::string label() const override { return label_; } 28 std::string label() const override { return label_; }
29 29
30 bool AddTrack(AudioTrackInterface* track) override; 30 bool AddTrack(AudioTrackInterface* track) override;
31 bool AddTrack(VideoTrackInterface* track) override; 31 bool AddTrack(VideoTrackInterface* track) override;
32 bool RemoveTrack(AudioTrackInterface* track) override; 32 bool RemoveTrack(AudioTrackInterface* track) override;
33 bool RemoveTrack(VideoTrackInterface* track) override; 33 bool RemoveTrack(VideoTrackInterface* track) override;
34 virtual rtc::scoped_refptr<AudioTrackInterface> 34 rtc::scoped_refptr<AudioTrackInterface>
35 FindAudioTrack(const std::string& track_id); 35 FindAudioTrack(const std::string& track_id) override;
36 virtual rtc::scoped_refptr<VideoTrackInterface> 36 rtc::scoped_refptr<VideoTrackInterface>
37 FindVideoTrack(const std::string& track_id); 37 FindVideoTrack(const std::string& track_id) override;
38 38
39 AudioTrackVector GetAudioTracks() override { return audio_tracks_; } 39 AudioTrackVector GetAudioTracks() override { return audio_tracks_; }
40 VideoTrackVector GetVideoTracks() override { return video_tracks_; } 40 VideoTrackVector GetVideoTracks() override { return video_tracks_; }
41 41
42 protected: 42 protected:
43 explicit MediaStream(const std::string& label); 43 explicit MediaStream(const std::string& label);
44 44
45 private: 45 private:
46 template <typename TrackVector, typename Track> 46 template <typename TrackVector, typename Track>
47 bool AddTrack(TrackVector* Tracks, Track* track); 47 bool AddTrack(TrackVector* Tracks, Track* track);
48 template <typename TrackVector> 48 template <typename TrackVector>
49 bool RemoveTrack(TrackVector* Tracks, MediaStreamTrackInterface* track); 49 bool RemoveTrack(TrackVector* Tracks, MediaStreamTrackInterface* track);
50 50
51 std::string label_; 51 std::string label_;
52 AudioTrackVector audio_tracks_; 52 AudioTrackVector audio_tracks_;
53 VideoTrackVector video_tracks_; 53 VideoTrackVector video_tracks_;
54 }; 54 };
55 55
56 } // namespace webrtc 56 } // namespace webrtc
57 57
58 #endif // WEBRTC_API_MEDIASTREAM_H_ 58 #endif // WEBRTC_API_MEDIASTREAM_H_
OLDNEW
« no previous file with comments | « webrtc/api/java/jni/peerconnection_jni.cc ('k') | webrtc/api/peerconnectionfactory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698