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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/api/mediastreaminterface.h ('k') | webrtc/api/mediastreamtrackproxy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/api/mediastreamtrack.h
diff --git a/webrtc/api/mediastreamtrack.h b/webrtc/api/mediastreamtrack.h
index e6f02e58fbfd87a052ea814707d6b880c057d2d3..9ba042010f78274e047f21e3098ccf7267456af7 100644
--- a/webrtc/api/mediastreamtrack.h
+++ b/webrtc/api/mediastreamtrack.h
@@ -25,12 +25,12 @@ class MediaStreamTrack : public Notifier<T> {
public:
typedef typename T::TrackState TypedTrackState;
- virtual std::string id() const { return id_; }
- virtual MediaStreamTrackInterface::TrackState state() const {
+ std::string id() const override { return id_; }
+ MediaStreamTrackInterface::TrackState state() const override {
return state_;
}
- virtual bool enabled() const { return enabled_; }
- virtual bool set_enabled(bool enable) {
+ bool enabled() const override { return enabled_; }
+ bool set_enabled(bool enable) override {
bool fire_on_change = (enable != enabled_);
enabled_ = enable;
if (fire_on_change) {
@@ -38,7 +38,12 @@ class MediaStreamTrack : public Notifier<T> {
}
return fire_on_change;
}
- virtual bool set_state(MediaStreamTrackInterface::TrackState new_state) {
+
+ protected:
+ explicit MediaStreamTrack(const std::string& id)
+ : enabled_(true), id_(id), state_(MediaStreamTrackInterface::kLive) {}
+
+ bool set_state(MediaStreamTrackInterface::TrackState new_state) {
bool fire_on_change = (state_ != new_state);
state_ = new_state;
if (fire_on_change)
@@ -46,10 +51,6 @@ class MediaStreamTrack : public Notifier<T> {
return true;
}
- protected:
- explicit MediaStreamTrack(const std::string& id)
- : enabled_(true), id_(id), state_(MediaStreamTrackInterface::kLive) {}
-
private:
bool enabled_;
std::string id_;
« 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