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

Side by Side Diff: Source/Platform/chromium/public/WebMediaStream.h

Issue 13844006: MediaStream API: Moving Add/Remove track from WebMediaStreamCenterClient to WebMediaStream (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased 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
« no previous file with comments | « no previous file | Source/Platform/chromium/public/WebMediaStreamCenterClient.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 bool isNull() const { return m_private.isNull(); } 69 bool isNull() const { return m_private.isNull(); }
70 70
71 // DEPRECATED 71 // DEPRECATED
72 WEBKIT_EXPORT WebString label() const; 72 WEBKIT_EXPORT WebString label() const;
73 73
74 WEBKIT_EXPORT WebString id() const; 74 WEBKIT_EXPORT WebString id() const;
75 75
76 WEBKIT_EXPORT void audioTracks(WebVector<WebMediaStreamTrack>&) const; 76 WEBKIT_EXPORT void audioTracks(WebVector<WebMediaStreamTrack>&) const;
77 WEBKIT_EXPORT void videoTracks(WebVector<WebMediaStreamTrack>&) const; 77 WEBKIT_EXPORT void videoTracks(WebVector<WebMediaStreamTrack>&) const;
78 78
79 WEBKIT_EXPORT void addTrack(const WebMediaStreamTrack&);
80 WEBKIT_EXPORT void removeTrack(const WebMediaStreamTrack&);
81
79 // DEPRECATED 82 // DEPRECATED
80 void audioSources(WebVector<WebMediaStreamTrack>& tracks) const { audioTrack s(tracks); } 83 void audioSources(WebVector<WebMediaStreamTrack>& tracks) const { audioTrack s(tracks); }
81 void videoSources(WebVector<WebMediaStreamTrack>& tracks) const { videoTrack s(tracks); } 84 void videoSources(WebVector<WebMediaStreamTrack>& tracks) const { videoTrack s(tracks); }
82 85
83 // Extra data associated with this WebMediaStream. 86 // Extra data associated with this WebMediaStream.
84 // If non-null, the extra data pointer will be deleted when the object is de stroyed. 87 // If non-null, the extra data pointer will be deleted when the object is de stroyed.
85 // Setting the extra data pointer will cause any existing non-null 88 // Setting the extra data pointer will cause any existing non-null
86 // extra data pointer to be deleted. 89 // extra data pointer to be deleted.
87 WEBKIT_EXPORT ExtraData* extraData() const; 90 WEBKIT_EXPORT ExtraData* extraData() const;
88 WEBKIT_EXPORT void setExtraData(ExtraData*); 91 WEBKIT_EXPORT void setExtraData(ExtraData*);
89 92
90 #if WEBKIT_IMPLEMENTATION 93 #if WEBKIT_IMPLEMENTATION
91 WebMediaStream(WebCore::MediaStreamDescriptor*); 94 WebMediaStream(WebCore::MediaStreamDescriptor*);
92 WebMediaStream(const WTF::PassRefPtr<WebCore::MediaStreamDescriptor>&); 95 WebMediaStream(const WTF::PassRefPtr<WebCore::MediaStreamDescriptor>&);
93 operator WTF::PassRefPtr<WebCore::MediaStreamDescriptor>() const; 96 operator WTF::PassRefPtr<WebCore::MediaStreamDescriptor>() const;
94 operator WebCore::MediaStreamDescriptor*() const; 97 operator WebCore::MediaStreamDescriptor*() const;
95 WebMediaStream& operator=(const WTF::PassRefPtr<WebCore::MediaStreamDescript or>&); 98 WebMediaStream& operator=(const WTF::PassRefPtr<WebCore::MediaStreamDescript or>&);
96 #endif 99 #endif
97 100
98 private: 101 private:
99 WebPrivatePtr<WebCore::MediaStreamDescriptor> m_private; 102 WebPrivatePtr<WebCore::MediaStreamDescriptor> m_private;
100 }; 103 };
101 104
102 } // namespace WebKit 105 } // namespace WebKit
103 106
104 #endif // WebMediaStream_h 107 #endif // WebMediaStream_h
OLDNEW
« no previous file with comments | « no previous file | Source/Platform/chromium/public/WebMediaStreamCenterClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698