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

Unified Diff: remoting/client/chromoting_client.cc

Issue 18452006: Make AudioPlayer optional in ChromotingClient (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: remoting/client/chromoting_client.cc
diff --git a/remoting/client/chromoting_client.cc b/remoting/client/chromoting_client.cc
index 73a762d6ea53d3e469abbd50fe5ee997c76287d3..4b11385208134edae74e9a3890da34fe5dc3106c 100644
--- a/remoting/client/chromoting_client.cc
+++ b/remoting/client/chromoting_client.cc
@@ -41,10 +41,12 @@ ChromotingClient::ChromotingClient(
new RectangleUpdateDecoder(client_context->main_task_runner(),
client_context->decode_task_runner(),
frame_consumer);
- audio_decode_scheduler_.reset(new AudioDecodeScheduler(
- client_context->main_task_runner(),
- client_context->audio_decode_task_runner(),
- audio_player.Pass()));
+ if (audio_player.get())
Wez 2013/07/09 20:08:07 nit: if (audio_player)
Wez 2013/07/09 20:08:07 This if has a multi-line statement, so use {}
solb 2013/07/10 00:00:31 Done.
solb 2013/07/10 00:00:31 Done.
+ audio_decode_scheduler_.reset(new AudioDecodeScheduler(
+ client_context->main_task_runner(),
+ client_context->audio_decode_task_runner(),
+ audio_player.Pass()));
+ // Otherwise, it will be left as a null pointer.
Wez 2013/07/09 20:08:07 What does this comment mean?
solb 2013/07/10 00:00:31 Done.
}
ChromotingClient::~ChromotingClient() {

Powered by Google App Engine
This is Rietveld 408576698