| OLD | NEW |
| 1 /* | 1 /* |
| 2 * libjingle | 2 * libjingle |
| 3 * Copyright 2011 Google Inc. | 3 * Copyright 2011 Google Inc. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are met: | 6 * modification, are permitted provided that the following conditions are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright notice, | 8 * 1. Redistributions of source code must retain the above copyright notice, |
| 9 * this list of conditions and the following disclaimer. | 9 * this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright notice, | 10 * 2. Redistributions in binary form must reproduce the above copyright notice, |
| 11 * this list of conditions and the following disclaimer in the documentation | 11 * this list of conditions and the following disclaimer in the documentation |
| 12 * and/or other materials provided with the distribution. | 12 * and/or other materials provided with the distribution. |
| 13 * 3. The name of the author may not be used to endorse or promote products | 13 * 3. The name of the author may not be used to endorse or promote products |
| 14 * derived from this software without specific prior written permission. | 14 * derived from this software without specific prior written permission. |
| 15 * | 15 * |
| 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED | 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED |
| 17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | 17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF |
| 18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO | 18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO |
| 19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
| 20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; | 21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; |
| 22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, | 22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, |
| 23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR | 23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR |
| 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
| 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 26 */ | 26 */ |
| 27 | 27 |
| 28 // This file contains the implementation of MediaStreamInterface interface. | 28 // This file contains the implementation of MediaStreamInterface interface. |
| 29 | 29 |
| 30 #ifndef TALK_APP_WEBRTC_MEDIASTREAM_H_ | 30 #ifndef WEBRTC_API_MEDIASTREAM_H_ |
| 31 #define TALK_APP_WEBRTC_MEDIASTREAM_H_ | 31 #define WEBRTC_API_MEDIASTREAM_H_ |
| 32 | 32 |
| 33 #include <string> | 33 #include <string> |
| 34 #include <vector> | 34 #include <vector> |
| 35 | 35 |
| 36 #include "talk/app/webrtc/mediastreaminterface.h" | 36 #include "webrtc/api/mediastreaminterface.h" |
| 37 #include "talk/app/webrtc/notifier.h" | 37 #include "webrtc/api/notifier.h" |
| 38 | 38 |
| 39 namespace webrtc { | 39 namespace webrtc { |
| 40 | 40 |
| 41 class MediaStream : public Notifier<MediaStreamInterface> { | 41 class MediaStream : public Notifier<MediaStreamInterface> { |
| 42 public: | 42 public: |
| 43 static rtc::scoped_refptr<MediaStream> Create(const std::string& label); | 43 static rtc::scoped_refptr<MediaStream> Create(const std::string& label); |
| 44 | 44 |
| 45 std::string label() const override { return label_; } | 45 std::string label() const override { return label_; } |
| 46 | 46 |
| 47 bool AddTrack(AudioTrackInterface* track) override; | 47 bool AddTrack(AudioTrackInterface* track) override; |
| (...skipping 17 matching lines...) Expand all Loading... |
| 65 template <typename TrackVector> | 65 template <typename TrackVector> |
| 66 bool RemoveTrack(TrackVector* Tracks, MediaStreamTrackInterface* track); | 66 bool RemoveTrack(TrackVector* Tracks, MediaStreamTrackInterface* track); |
| 67 | 67 |
| 68 std::string label_; | 68 std::string label_; |
| 69 AudioTrackVector audio_tracks_; | 69 AudioTrackVector audio_tracks_; |
| 70 VideoTrackVector video_tracks_; | 70 VideoTrackVector video_tracks_; |
| 71 }; | 71 }; |
| 72 | 72 |
| 73 } // namespace webrtc | 73 } // namespace webrtc |
| 74 | 74 |
| 75 #endif // TALK_APP_WEBRTC_MEDIASTREAM_H_ | 75 #endif // WEBRTC_API_MEDIASTREAM_H_ |
| OLD | NEW |