Index: remoting/protocol/connection_to_client.cc |
diff --git a/remoting/protocol/connection_to_client.cc b/remoting/protocol/connection_to_client.cc |
index 03ee1fec34bf4da5915c2a05a5a0451352f64e6e..e054afd448852f38485c53d3f279d1e804520d9e 100644 |
--- a/remoting/protocol/connection_to_client.cc |
+++ b/remoting/protocol/connection_to_client.cc |
@@ -68,6 +68,11 @@ VideoStub* ConnectionToClient::video_stub() { |
return video_writer_.get(); |
} |
+AudioStub* ConnectionToClient::audio_stub() { |
+ DCHECK(CalledOnValidThread()); |
+ return audio_writer_.get(); |
+} |
+ |
// Return pointer to ClientStub. |
ClientStub* ConnectionToClient::client_stub() { |
DCHECK(CalledOnValidThread()); |
@@ -120,6 +125,12 @@ void ConnectionToClient::OnSessionStateChange(Session::State state) { |
video_writer_->Init(session_.get(), base::Bind( |
&ConnectionToClient::OnChannelInitialized, base::Unretained(this))); |
+ audio_writer_ = AudioWriter::Create(session_->config()); |
+ if (audio_writer_ != NULL) { |
Wez
2012/06/22 18:29:53
nit: if (audio_writer_.get()) seems clearer here,
kxing
2012/06/22 19:12:31
Done.
|
+ audio_writer_->Init(session_.get(), base::Bind( |
+ &ConnectionToClient::OnChannelInitialized, base::Unretained(this))); |
+ } |
+ |
// Notify the handler after initializing the channels, so that |
// ClientSession can get a client clipboard stub. |
handler_->OnConnectionAuthenticated(this); |
@@ -158,7 +169,9 @@ void ConnectionToClient::NotifyIfChannelsReady() { |
if (control_dispatcher_.get() && control_dispatcher_->is_connected() && |
event_dispatcher_.get() && event_dispatcher_->is_connected() && |
- video_writer_.get() && video_writer_->is_connected()) { |
+ video_writer_.get() && video_writer_->is_connected() && |
+ (!session_->config().is_audio_enabled() || |
+ (audio_writer_.get() && audio_writer_->is_connected()))) { |
Wez
2012/06/22 18:29:53
nit: This if has become silly; we should re-expres
kxing
2012/06/22 19:12:31
Done.
|
handler_->OnConnectionChannelsConnected(this); |
} |
} |
@@ -172,6 +185,7 @@ void ConnectionToClient::CloseChannels() { |
control_dispatcher_.reset(); |
event_dispatcher_.reset(); |
video_writer_.reset(); |
+ audio_writer_.reset(); |
} |
} // namespace protocol |