| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Ericsson AB. All rights reserved. | 2 * Copyright (C) 2011 Ericsson AB. All rights reserved. |
| 3 * Copyright (C) 2012 Google Inc. All rights reserved. | 3 * Copyright (C) 2012 Google Inc. 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 * | 8 * |
| 9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 ReadyStateEnded = 2 | 68 ReadyStateEnded = 2 |
| 69 }; | 69 }; |
| 70 | 70 |
| 71 static MediaStreamSource* create(const String& id, | 71 static MediaStreamSource* create(const String& id, |
| 72 StreamType, | 72 StreamType, |
| 73 const String& name, | 73 const String& name, |
| 74 bool remote, | 74 bool remote, |
| 75 ReadyState = ReadyStateLive, | 75 ReadyState = ReadyStateLive, |
| 76 bool requiresConsumer = false); | 76 bool requiresConsumer = false); |
| 77 | 77 |
| 78 ~MediaStreamSource(); |
| 79 |
| 78 const String& id() const { return m_id; } | 80 const String& id() const { return m_id; } |
| 79 StreamType type() const { return m_type; } | 81 StreamType type() const { return m_type; } |
| 80 const String& name() const { return m_name; } | 82 const String& name() const { return m_name; } |
| 81 bool remote() const { return m_remote; } | 83 bool remote() const { return m_remote; } |
| 82 | 84 |
| 83 void setReadyState(ReadyState); | 85 void setReadyState(ReadyState); |
| 84 ReadyState getReadyState() const { return m_readyState; } | 86 ReadyState getReadyState() const { return m_readyState; } |
| 85 | 87 |
| 86 void addObserver(Observer*); | 88 void addObserver(Observer*); |
| 87 | 89 |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 131 HeapHashSet<Member<AudioDestinationConsumer>> m_audioConsumers; | 133 HeapHashSet<Member<AudioDestinationConsumer>> m_audioConsumers; |
| 132 std::unique_ptr<ExtraData> m_extraData; | 134 std::unique_ptr<ExtraData> m_extraData; |
| 133 WebMediaConstraints m_constraints; | 135 WebMediaConstraints m_constraints; |
| 134 }; | 136 }; |
| 135 | 137 |
| 136 typedef HeapVector<Member<MediaStreamSource>> MediaStreamSourceVector; | 138 typedef HeapVector<Member<MediaStreamSource>> MediaStreamSourceVector; |
| 137 | 139 |
| 138 } // namespace blink | 140 } // namespace blink |
| 139 | 141 |
| 140 #endif // MediaStreamSource_h | 142 #endif // MediaStreamSource_h |
| OLD | NEW |