| OLD | NEW |
| 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 // This file contains the implementation of MediaStreamInterface interface. | 11 // This file contains the implementation of MediaStreamInterface interface. |
| 12 | 12 |
| 13 #ifndef WEBRTC_API_MEDIASTREAM_H_ | 13 #ifndef WEBRTC_PC_MEDIASTREAM_H_ |
| 14 #define WEBRTC_API_MEDIASTREAM_H_ | 14 #define WEBRTC_PC_MEDIASTREAM_H_ |
| 15 | 15 |
| 16 #include <string> | 16 #include <string> |
| 17 #include <vector> | 17 #include <vector> |
| 18 | 18 |
| 19 #include "webrtc/api/mediastreaminterface.h" | 19 #include "webrtc/api/mediastreaminterface.h" |
| 20 #include "webrtc/api/notifier.h" | 20 #include "webrtc/api/notifier.h" |
| 21 | 21 |
| 22 namespace webrtc { | 22 namespace webrtc { |
| 23 | 23 |
| 24 class MediaStream : public Notifier<MediaStreamInterface> { | 24 class MediaStream : public Notifier<MediaStreamInterface> { |
| (...skipping 23 matching lines...) Expand all Loading... |
| 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_PC_MEDIASTREAM_H_ |
| OLD | NEW |