| OLD | NEW |
| 1 /* | 1 /* |
| 2 * libjingle | 2 * libjingle |
| 3 * Copyright 2004--2011 Google Inc. | 3 * Copyright 2004--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, |
| (...skipping 13 matching lines...) Expand all Loading... |
| 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 #include "talk/app/webrtc/audiotrack.h" | 28 #include "talk/app/webrtc/audiotrack.h" |
| 29 | 29 |
| 30 #include <string> | 30 #include <string> |
| 31 | 31 |
| 32 namespace webrtc { | 32 namespace webrtc { |
| 33 | 33 |
| 34 static const char kAudioTrackKind[] = "audio"; | 34 const char MediaStreamTrackInterface::kAudioKind[] = "audio"; |
| 35 | 35 |
| 36 AudioTrack::AudioTrack(const std::string& label, | 36 AudioTrack::AudioTrack(const std::string& label, |
| 37 AudioSourceInterface* audio_source) | 37 AudioSourceInterface* audio_source) |
| 38 : MediaStreamTrack<AudioTrackInterface>(label), | 38 : MediaStreamTrack<AudioTrackInterface>(label), |
| 39 audio_source_(audio_source) { | 39 audio_source_(audio_source) { |
| 40 } | 40 } |
| 41 | 41 |
| 42 std::string AudioTrack::kind() const { | 42 std::string AudioTrack::kind() const { |
| 43 return kAudioTrackKind; | 43 return kAudioKind; |
| 44 } | 44 } |
| 45 | 45 |
| 46 rtc::scoped_refptr<AudioTrack> AudioTrack::Create( | 46 rtc::scoped_refptr<AudioTrack> AudioTrack::Create( |
| 47 const std::string& id, AudioSourceInterface* source) { | 47 const std::string& id, AudioSourceInterface* source) { |
| 48 rtc::RefCountedObject<AudioTrack>* track = | 48 rtc::RefCountedObject<AudioTrack>* track = |
| 49 new rtc::RefCountedObject<AudioTrack>(id, source); | 49 new rtc::RefCountedObject<AudioTrack>(id, source); |
| 50 return track; | 50 return track; |
| 51 } | 51 } |
| 52 | 52 |
| 53 } // namespace webrtc | 53 } // namespace webrtc |
| OLD | NEW |