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

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

Issue 1816143002: Removed MediaStreamTrackInterface::set_state (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@track_state_listen_on_source2
Patch Set: Rebased 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/api/mediastreaminterface.h ('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_MEDIASTREAMTRACK_H_ 11 #ifndef WEBRTC_API_MEDIASTREAMTRACK_H_
12 #define WEBRTC_API_MEDIASTREAMTRACK_H_ 12 #define WEBRTC_API_MEDIASTREAMTRACK_H_
13 13
14 #include <string> 14 #include <string>
15 15
16 #include "webrtc/api/mediastreaminterface.h" 16 #include "webrtc/api/mediastreaminterface.h"
17 #include "webrtc/api/notifier.h" 17 #include "webrtc/api/notifier.h"
18 18
19 namespace webrtc { 19 namespace webrtc {
20 20
21 // MediaTrack implements the interface common to AudioTrackInterface and 21 // MediaTrack implements the interface common to AudioTrackInterface and
22 // VideoTrackInterface. 22 // VideoTrackInterface.
23 template <typename T> 23 template <typename T>
24 class MediaStreamTrack : public Notifier<T> { 24 class MediaStreamTrack : public Notifier<T> {
25 public: 25 public:
26 typedef typename T::TrackState TypedTrackState; 26 typedef typename T::TrackState TypedTrackState;
27 27
28 virtual std::string id() const { return id_; } 28 std::string id() const override { return id_; }
29 virtual MediaStreamTrackInterface::TrackState state() const { 29 MediaStreamTrackInterface::TrackState state() const override {
30 return state_; 30 return state_;
31 } 31 }
32 virtual bool enabled() const { return enabled_; } 32 bool enabled() const override { return enabled_; }
33 virtual bool set_enabled(bool enable) { 33 bool set_enabled(bool enable) override {
34 bool fire_on_change = (enable != enabled_); 34 bool fire_on_change = (enable != enabled_);
35 enabled_ = enable; 35 enabled_ = enable;
36 if (fire_on_change) { 36 if (fire_on_change) {
37 Notifier<T>::FireOnChanged(); 37 Notifier<T>::FireOnChanged();
38 } 38 }
39 return fire_on_change; 39 return fire_on_change;
40 } 40 }
41 virtual bool set_state(MediaStreamTrackInterface::TrackState new_state) { 41
42 protected:
43 explicit MediaStreamTrack(const std::string& id)
44 : enabled_(true), id_(id), state_(MediaStreamTrackInterface::kLive) {}
45
46 bool set_state(MediaStreamTrackInterface::TrackState new_state) {
42 bool fire_on_change = (state_ != new_state); 47 bool fire_on_change = (state_ != new_state);
43 state_ = new_state; 48 state_ = new_state;
44 if (fire_on_change) 49 if (fire_on_change)
45 Notifier<T>::FireOnChanged(); 50 Notifier<T>::FireOnChanged();
46 return true; 51 return true;
47 } 52 }
48 53
49 protected:
50 explicit MediaStreamTrack(const std::string& id)
51 : enabled_(true), id_(id), state_(MediaStreamTrackInterface::kLive) {}
52
53 private: 54 private:
54 bool enabled_; 55 bool enabled_;
55 std::string id_; 56 std::string id_;
56 MediaStreamTrackInterface::TrackState state_; 57 MediaStreamTrackInterface::TrackState state_;
57 }; 58 };
58 59
59 } // namespace webrtc 60 } // namespace webrtc
60 61
61 #endif // WEBRTC_API_MEDIASTREAMTRACK_H_ 62 #endif // WEBRTC_API_MEDIASTREAMTRACK_H_
OLDNEW
« no previous file with comments | « webrtc/api/mediastreaminterface.h ('k') | webrtc/api/mediastreamtrackproxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698