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

Unified Diff: webrtc/api/mediastreamtrack.h

Issue 2514883002: Create //webrtc/api:libjingle_peerconnection_api + refactorings. (Closed)
Patch Set: Rebase Created 3 years, 11 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/mediastreamobserver.cc ('k') | webrtc/api/mediatypes.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 9ba042010f78274e047f21e3098ccf7267456af7..6075abec6333cdaad109b5395edc61e51f94cf8a 100644
--- a/webrtc/api/mediastreamtrack.h
+++ b/webrtc/api/mediastreamtrack.h
@@ -11,52 +11,8 @@
#ifndef WEBRTC_API_MEDIASTREAMTRACK_H_
#define WEBRTC_API_MEDIASTREAMTRACK_H_
-#include <string>
-
-#include "webrtc/api/mediastreaminterface.h"
-#include "webrtc/api/notifier.h"
-
-namespace webrtc {
-
-// MediaTrack implements the interface common to AudioTrackInterface and
-// VideoTrackInterface.
-template <typename T>
-class MediaStreamTrack : public Notifier<T> {
- public:
- typedef typename T::TrackState TypedTrackState;
-
- std::string id() const override { return id_; }
- MediaStreamTrackInterface::TrackState state() const override {
- return state_;
- }
- bool enabled() const override { return enabled_; }
- bool set_enabled(bool enable) override {
- bool fire_on_change = (enable != enabled_);
- enabled_ = enable;
- if (fire_on_change) {
- Notifier<T>::FireOnChanged();
- }
- return fire_on_change;
- }
-
- 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)
- Notifier<T>::FireOnChanged();
- return true;
- }
-
- private:
- bool enabled_;
- std::string id_;
- MediaStreamTrackInterface::TrackState state_;
-};
-
-} // namespace webrtc
+// Including this file is deprecated. It is no longer part of the public API.
+// This only includes the file in its new location for backwards compatibility.
+#include "webrtc/pc/mediastreamtrack.h"
#endif // WEBRTC_API_MEDIASTREAMTRACK_H_
« no previous file with comments | « webrtc/api/mediastreamobserver.cc ('k') | webrtc/api/mediatypes.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698