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

Side by Side Diff: content/renderer/media/media_stream_track.cc

Issue 515093003: Manual fixups in media code for scoped_refptr operator T* removal. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Moar Created 6 years, 3 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/media/media_stream_track.h" 5 #include "content/renderer/media/media_stream_track.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h" 8 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
9 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h" 9 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h"
10 10
11 namespace content { 11 namespace content {
12 12
13 MediaStreamTrack* MediaStreamTrack::GetTrack( 13 MediaStreamTrack* MediaStreamTrack::GetTrack(
14 const blink::WebMediaStreamTrack& track) { 14 const blink::WebMediaStreamTrack& track) {
15 if (track.isNull()) 15 if (track.isNull())
16 return NULL; 16 return NULL;
17 return static_cast<MediaStreamTrack*>(track.extraData()); 17 return static_cast<MediaStreamTrack*>(track.extraData());
18 } 18 }
19 19
20 MediaStreamTrack::MediaStreamTrack( 20 MediaStreamTrack::MediaStreamTrack(
21 webrtc::MediaStreamTrackInterface* track, bool is_local_track) 21 const scoped_refptr<webrtc::MediaStreamTrackInterface>& track,
22 : track_(track), 22 bool is_local_track)
23 muted_state_(false), 23 : track_(track), muted_state_(false), is_local_track_(is_local_track) {
24 is_local_track_(is_local_track){
25 } 24 }
26 25
27 MediaStreamTrack::~MediaStreamTrack() { 26 MediaStreamTrack::~MediaStreamTrack() {
28 } 27 }
29 28
30 void MediaStreamTrack::SetEnabled(bool enabled) { 29 void MediaStreamTrack::SetEnabled(bool enabled) {
31 DCHECK(thread_checker_.CalledOnValidThread()); 30 DCHECK(thread_checker_.CalledOnValidThread());
32 if (track_.get()) 31 if (track_.get())
33 track_->set_enabled(enabled); 32 track_->set_enabled(enabled);
34 } 33 }
(...skipping 17 matching lines...) Expand all
52 if (track_.get()) 51 if (track_.get())
53 track_->set_enabled(false); 52 track_->set_enabled(false);
54 } 53 }
55 54
56 webrtc::AudioTrackInterface* MediaStreamTrack::GetAudioAdapter() { 55 webrtc::AudioTrackInterface* MediaStreamTrack::GetAudioAdapter() {
57 DCHECK(thread_checker_.CalledOnValidThread()); 56 DCHECK(thread_checker_.CalledOnValidThread());
58 return static_cast<webrtc::AudioTrackInterface*>(track_.get()); 57 return static_cast<webrtc::AudioTrackInterface*>(track_.get());
59 } 58 }
60 59
61 } // namespace content 60 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/media_stream_track.h ('k') | content/renderer/media/media_stream_video_track.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698