Final name changing of MediaStreamInterface.label() to id().
Downstreams have been updated, and this now updates all uses of label() to id() within WebRTC code. This change also makes id() pure virtual and removes label(). Bug: webrtc:8977 Change-Id: Ib045ea4fabba6f14447c64875c7aeba87dc2be24 Reviewed-on: https://webrtc-review.googlesource.com/60382 Reviewed-by: Per Kjellander <perkj@webrtc.org> Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org> Commit-Queue: Seth Hampson <shampson@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22431}
This commit is contained in:
@ -58,15 +58,4 @@ AudioTrackInterface::GetAudioProcessor() {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
// TODO(shampson): Remove this once downstreams are using id().
|
||||
std::string MediaStreamInterface::label() const {
|
||||
return id();
|
||||
}
|
||||
|
||||
// TODO(shampson): Remove this default implementation once downstreams have
|
||||
// implemented.
|
||||
std::string MediaStreamInterface::id() const {
|
||||
return std::string();
|
||||
}
|
||||
|
||||
} // namespace webrtc
|
||||
|
||||
@ -313,10 +313,7 @@ typedef std::vector<rtc::scoped_refptr<VideoTrackInterface> >
|
||||
class MediaStreamInterface : public rtc::RefCountInterface,
|
||||
public NotifierInterface {
|
||||
public:
|
||||
// TODO(shampson): Remove once downstreams are updated to use id().
|
||||
virtual std::string label() const;
|
||||
// TODO(shampson): Make pure virtual once downstreams have implemented.
|
||||
virtual std::string id() const;
|
||||
virtual std::string id() const = 0;
|
||||
|
||||
virtual AudioTrackVector GetAudioTracks() = 0;
|
||||
virtual VideoTrackVector GetVideoTracks() = 0;
|
||||
|
||||
@ -22,7 +22,6 @@ namespace webrtc {
|
||||
// are called on is an implementation detail.
|
||||
BEGIN_SIGNALING_PROXY_MAP(MediaStream)
|
||||
PROXY_SIGNALING_THREAD_DESTRUCTOR()
|
||||
PROXY_CONSTMETHOD0(std::string, label)
|
||||
PROXY_CONSTMETHOD0(std::string, id)
|
||||
PROXY_METHOD0(AudioTrackVector, GetAudioTracks)
|
||||
PROXY_METHOD0(VideoTrackVector, GetVideoTracks)
|
||||
|
||||
Reference in New Issue
Block a user