OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 Google Inc. All rights reserved. |
3 * Copyright (C) 2011 Ericsson AB. All rights reserved. | 3 * Copyright (C) 2011 Ericsson AB. All rights reserved. |
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 | 6 * modification, are permitted provided that the following conditions |
7 * are met: | 7 * are met: |
8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
57 | 57 |
58 String id() const { return m_descriptor->id(); } | 58 String id() const { return m_descriptor->id(); } |
59 | 59 |
60 void addTrack(MediaStreamTrack*, ExceptionState&); | 60 void addTrack(MediaStreamTrack*, ExceptionState&); |
61 void removeTrack(MediaStreamTrack*, ExceptionState&); | 61 void removeTrack(MediaStreamTrack*, ExceptionState&); |
62 MediaStreamTrack* getTrackById(String); | 62 MediaStreamTrack* getTrackById(String); |
63 MediaStream* clone(ExecutionContext*); | 63 MediaStream* clone(ExecutionContext*); |
64 | 64 |
65 MediaStreamTrackVector getAudioTracks() const { return m_audioTracks; } | 65 MediaStreamTrackVector getAudioTracks() const { return m_audioTracks; } |
66 MediaStreamTrackVector getVideoTracks() const { return m_videoTracks; } | 66 MediaStreamTrackVector getVideoTracks() const { return m_videoTracks; } |
| 67 MediaStreamTrackVector getTracks(); |
67 | 68 |
68 bool ended() const; | 69 bool ended() const; |
69 void stop(); | 70 void stop(); |
70 | 71 |
71 DEFINE_ATTRIBUTE_EVENT_LISTENER(ended); | 72 DEFINE_ATTRIBUTE_EVENT_LISTENER(ended); |
72 DEFINE_ATTRIBUTE_EVENT_LISTENER(addtrack); | 73 DEFINE_ATTRIBUTE_EVENT_LISTENER(addtrack); |
73 DEFINE_ATTRIBUTE_EVENT_LISTENER(removetrack); | 74 DEFINE_ATTRIBUTE_EVENT_LISTENER(removetrack); |
74 | 75 |
75 void trackEnded(); | 76 void trackEnded(); |
76 | 77 |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
110 | 111 |
111 Timer<MediaStream> m_scheduledEventTimer; | 112 Timer<MediaStream> m_scheduledEventTimer; |
112 WillBeHeapVector<RefPtrWillBeMember<Event> > m_scheduledEvents; | 113 WillBeHeapVector<RefPtrWillBeMember<Event> > m_scheduledEvents; |
113 }; | 114 }; |
114 | 115 |
115 typedef HeapVector<Member<MediaStream> > MediaStreamVector; | 116 typedef HeapVector<Member<MediaStream> > MediaStreamVector; |
116 | 117 |
117 } // namespace WebCore | 118 } // namespace WebCore |
118 | 119 |
119 #endif // MediaStream_h | 120 #endif // MediaStream_h |
OLD | NEW |