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

Unified Diff: remoting/protocol/session_config.cc

Issue 10795075: Created define to switch on/off audio. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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
« no previous file with comments | « no previous file | remoting/remoting.gyp » ('j') | remoting/remoting.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/session_config.cc
diff --git a/remoting/protocol/session_config.cc b/remoting/protocol/session_config.cc
index cf6657ddd5bb8e44610c8f1f48ff3eb93f0b6804..c3d56e6c3cf0ffeac3fb3d920ae4ccf9619f2ac1 100644
--- a/remoting/protocol/session_config.cc
+++ b/remoting/protocol/session_config.cc
@@ -175,6 +175,16 @@ scoped_ptr<CandidateSessionConfig> CandidateSessionConfig::CreateDefault() {
ChannelConfig(ChannelConfig::TRANSPORT_STREAM,
kDefaultStreamVersion,
ChannelConfig::CODEC_VP8));
+#if ENABLE_AUDIO
Sergey Ulanov 2012/07/23 22:17:48 #if defined(ENABLE_REMOTING_AUDIO)
kxing 2012/07/24 15:02:16 Done.
+ result->mutable_audio_configs()->push_back(
+ ChannelConfig(ChannelConfig::TRANSPORT_STREAM,
+ kDefaultStreamVersion,
+ ChannelConfig::CODEC_VERBATIM));
+ result->mutable_audio_configs()->push_back(
+ ChannelConfig(ChannelConfig::TRANSPORT_NONE,
+ kDefaultStreamVersion,
+ ChannelConfig::CODEC_VERBATIM));
+#else
Sergey Ulanov 2012/07/23 22:17:48 #else // !defined(ENABLE_REMOTING_AUDIO)
kxing 2012/07/24 15:02:16 Done.
result->mutable_audio_configs()->push_back(
ChannelConfig(ChannelConfig::TRANSPORT_NONE,
kDefaultStreamVersion,
@@ -183,6 +193,7 @@ scoped_ptr<CandidateSessionConfig> CandidateSessionConfig::CreateDefault() {
ChannelConfig(ChannelConfig::TRANSPORT_STREAM,
kDefaultStreamVersion,
ChannelConfig::CODEC_VERBATIM));
+#endif
Sergey Ulanov 2012/07/23 22:17:48 #endig // !defined(ENABLE_REMOTING_AUDIO)
kxing 2012/07/24 15:02:16 Done.
result->mutable_audio_configs()->push_back(
ChannelConfig(ChannelConfig::TRANSPORT_STREAM,
kDefaultStreamVersion,
« no previous file with comments | « no previous file | remoting/remoting.gyp » ('j') | remoting/remoting.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698