diff options
| author | kxing@chromium.org <kxing@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-24 22:14:35 +0000 |
|---|---|---|
| committer | kxing@chromium.org <kxing@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-24 22:14:35 +0000 |
| commit | bfa30b6028ce51b9059e161f05232ced993f9cdc (patch) | |
| tree | 32e33a7b4dbd1fbc2aa82b9705245952f4d59ae6 | |
| parent | 98093fb0c03ee3477505d4686c821d3e33e1567c (diff) | |
| download | chromium_src-bfa30b6028ce51b9059e161f05232ced993f9cdc.zip chromium_src-bfa30b6028ce51b9059e161f05232ced993f9cdc.tar.gz chromium_src-bfa30b6028ce51b9059e161f05232ced993f9cdc.tar.bz2 | |
Created define to switch on/off audio.
Review URL: https://chromiumcodereview.appspot.com/10795075
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148223 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | remoting/protocol/session_config.cc | 10 | ||||
| -rw-r--r-- | remoting/remoting.gyp | 8 |
2 files changed, 12 insertions, 6 deletions
diff --git a/remoting/protocol/session_config.cc b/remoting/protocol/session_config.cc index cf6657d..139d05b 100644 --- a/remoting/protocol/session_config.cc +++ b/remoting/protocol/session_config.cc @@ -175,18 +175,16 @@ scoped_ptr<CandidateSessionConfig> CandidateSessionConfig::CreateDefault() { ChannelConfig(ChannelConfig::TRANSPORT_STREAM, kDefaultStreamVersion, ChannelConfig::CODEC_VP8)); - result->mutable_audio_configs()->push_back( - ChannelConfig(ChannelConfig::TRANSPORT_NONE, - kDefaultStreamVersion, - ChannelConfig::CODEC_VERBATIM)); +#if defined(ENABLE_REMOTING_AUDIO) result->mutable_audio_configs()->push_back( ChannelConfig(ChannelConfig::TRANSPORT_STREAM, kDefaultStreamVersion, ChannelConfig::CODEC_VERBATIM)); +#endif // defined(ENABLE_REMOTING_AUDIO) result->mutable_audio_configs()->push_back( - ChannelConfig(ChannelConfig::TRANSPORT_STREAM, + ChannelConfig(ChannelConfig::TRANSPORT_NONE, kDefaultStreamVersion, - ChannelConfig::CODEC_VORBIS)); + ChannelConfig::CODEC_VERBATIM)); return result.Pass(); } diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index a2a39a8..e924482 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -7,6 +7,7 @@ # TODO(dmaclach): can we pick this up some other way? Right now it's # duplicated from chrome.gyp 'chromium_code': 1, + 'remoting_audio': 0, # Use consistent strings across all platforms. Note that the plugin name # is brand-dependent and is defined further down. # Must match host/plugin/constants.h @@ -197,6 +198,13 @@ 'include_dirs': [ '..', # Root of Chrome checkout ], + 'conditions': [ + ['remoting_audio == 1', { + 'defines': [ + 'ENABLE_REMOTING_AUDIO', + ], + }], + ], }, 'conditions': [ |