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

Side by Side Diff: remoting/protocol/audio_reader.cc

Issue 609923004: Cleanup usage of scoped_ptr<> in remoting for C++11 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "remoting/protocol/audio_reader.h" 5 #include "remoting/protocol/audio_reader.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "net/socket/stream_socket.h" 8 #include "net/socket/stream_socket.h"
9 #include "remoting/base/constants.h" 9 #include "remoting/base/constants.h"
10 #include "remoting/protocol/session.h" 10 #include "remoting/protocol/session.h"
11 #include "remoting/protocol/session_config.h" 11 #include "remoting/protocol/session_config.h"
12 12
13 namespace remoting { 13 namespace remoting {
14 namespace protocol { 14 namespace protocol {
15 15
16 AudioReader::AudioReader(AudioPacket::Encoding encoding) 16 AudioReader::AudioReader(AudioPacket::Encoding encoding)
17 : ChannelDispatcherBase(kAudioChannelName), 17 : ChannelDispatcherBase(kAudioChannelName),
18 encoding_(encoding), 18 encoding_(encoding),
19 audio_stub_(NULL) { 19 audio_stub_(NULL) {
20 } 20 }
21 21
22 AudioReader::~AudioReader() { 22 AudioReader::~AudioReader() {
23 } 23 }
24 24
25 // static 25 // static
26 scoped_ptr<AudioReader> AudioReader::Create(const SessionConfig& config) { 26 scoped_ptr<AudioReader> AudioReader::Create(const SessionConfig& config) {
27 if (!config.is_audio_enabled()) 27 if (!config.is_audio_enabled())
28 return scoped_ptr<AudioReader>(); 28 return nullptr;
29 // TODO(kxing): Support different session configurations. 29 // TODO(kxing): Support different session configurations.
30 return scoped_ptr<AudioReader>(new AudioReader(AudioPacket::ENCODING_RAW)); 30 return scoped_ptr<AudioReader>(new AudioReader(AudioPacket::ENCODING_RAW));
31 } 31 }
32 32
33 void AudioReader::OnInitialized() { 33 void AudioReader::OnInitialized() {
34 reader_.Init(channel(), base::Bind(&AudioReader::OnNewData, 34 reader_.Init(channel(), base::Bind(&AudioReader::OnNewData,
35 base::Unretained(this))); 35 base::Unretained(this)));
36 } 36 }
37 37
38 void AudioReader::OnNewData(scoped_ptr<AudioPacket> packet, 38 void AudioReader::OnNewData(scoped_ptr<AudioPacket> packet,
39 const base::Closure& done_task) { 39 const base::Closure& done_task) {
40 audio_stub_->ProcessAudioPacket(packet.Pass(), done_task); 40 audio_stub_->ProcessAudioPacket(packet.Pass(), done_task);
41 } 41 }
42 42
43 } // namespace protocol 43 } // namespace protocol
44 } // namespace remoting 44 } // namespace remoting
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698