Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(429)

Side by Side Diff: Source/modules/mediastream/MediaStream.h

Issue 13982022: MediaStream API: Removing LocalMediaStream (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 String id() const { return m_descriptor->id(); } 53 String id() const { return m_descriptor->id(); }
54 54
55 void addTrack(PassRefPtr<MediaStreamTrack>, ExceptionCode&); 55 void addTrack(PassRefPtr<MediaStreamTrack>, ExceptionCode&);
56 void removeTrack(PassRefPtr<MediaStreamTrack>, ExceptionCode&); 56 void removeTrack(PassRefPtr<MediaStreamTrack>, ExceptionCode&);
57 MediaStreamTrack* getTrackById(String); 57 MediaStreamTrack* getTrackById(String);
58 58
59 MediaStreamTrackVector getAudioTracks() const { return m_audioTracks; } 59 MediaStreamTrackVector getAudioTracks() const { return m_audioTracks; }
60 MediaStreamTrackVector getVideoTracks() const { return m_videoTracks; } 60 MediaStreamTrackVector getVideoTracks() const { return m_videoTracks; }
61 61
62 bool ended() const; 62 bool ended() const;
63 void stop();
63 64
64 DEFINE_ATTRIBUTE_EVENT_LISTENER(ended); 65 DEFINE_ATTRIBUTE_EVENT_LISTENER(ended);
65 DEFINE_ATTRIBUTE_EVENT_LISTENER(addtrack); 66 DEFINE_ATTRIBUTE_EVENT_LISTENER(addtrack);
66 DEFINE_ATTRIBUTE_EVENT_LISTENER(removetrack); 67 DEFINE_ATTRIBUTE_EVENT_LISTENER(removetrack);
67 68
68 // MediaStreamDescriptorClient 69 // MediaStreamDescriptorClient
69 virtual void trackEnded() OVERRIDE; 70 virtual void trackEnded() OVERRIDE;
70 virtual void streamEnded() OVERRIDE; 71 virtual void streamEnded() OVERRIDE;
71 72
72 virtual bool isLocal() const { return false; }
73
74 MediaStreamDescriptor* descriptor() const { return m_descriptor.get(); } 73 MediaStreamDescriptor* descriptor() const { return m_descriptor.get(); }
75 74
76 // EventTarget 75 // EventTarget
77 virtual const AtomicString& interfaceName() const OVERRIDE; 76 virtual const AtomicString& interfaceName() const OVERRIDE;
78 virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE; 77 virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE;
79 78
80 using RefCounted<MediaStream>::ref; 79 using RefCounted<MediaStream>::ref;
81 using RefCounted<MediaStream>::deref; 80 using RefCounted<MediaStream>::deref;
82 81
83 protected: 82 protected:
(...skipping 30 matching lines...) Expand all
114 Vector<RefPtr<Event> > m_scheduledEvents; 113 Vector<RefPtr<Event> > m_scheduledEvents;
115 }; 114 };
116 115
117 typedef Vector<RefPtr<MediaStream> > MediaStreamVector; 116 typedef Vector<RefPtr<MediaStream> > MediaStreamVector;
118 117
119 } // namespace WebCore 118 } // namespace WebCore
120 119
121 #endif // ENABLE(MEDIA_STREAM) 120 #endif // ENABLE(MEDIA_STREAM)
122 121
123 #endif // MediaStream_h 122 #endif // MediaStream_h
OLDNEW
« no previous file with comments | « Source/modules/mediastream/LocalMediaStream.idl ('k') | Source/modules/mediastream/MediaStream.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698