diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-20 20:13:37 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-20 20:13:37 +0000 |
| commit | 728fd9a8661aa65f9ce9db1af0071bc52acb07d3 (patch) | |
| tree | 5667d76b9d1ca093e3ab7605ee3435975d6149bd | |
| parent | 25568995ace6835e015e3eb3bc06b1d0ff3984d3 (diff) | |
Merged revisions 241627 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r241627 | dvossel | 2010-01-20 14:01:07 -0600 (Wed, 20 Jan 2010) | 12 lines
Merged revisions 241626 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r241626 | dvossel | 2010-01-20 14:00:04 -0600 (Wed, 20 Jan 2010) | 6 lines
fixes parsing error in Makefile.
Some echo lines were missing "; . Thanks to jparker for pointing out
the problem.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@241631 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -683,11 +683,11 @@ samples: adsi echo ";cache_record_files = yes ; Cache recorded sound files to another directory during recording" ; \ echo ";record_cache_dir = /tmp ; Specify cache directory (used in conjunction with cache_record_files)" ; \ echo ";transmit_silence_during_record = yes ; Transmit SLINEAR silence while a channel is being recorded" ; \ - echo ";transmit_silence = yes ; Transmit silence while a channel is in a waiting state, a recording only state, or when DTMF is \ - echo " ; being generated. Note that the silence internally is generated in raw signed linear format. \ - echo " ; This means that it must be transcoded into the native format of the channel before it can be sent \ - echo " ; to the device. It is for this reason that this is optional, as it may result in requiring a \ - echo " ; temporary codec translation path for a channel that may not otherwise require one. \ + echo ";transmit_silence = yes ; Transmit silence while a channel is in a waiting state, a recording only state, or when DTMF is" ; \ + echo " ; being generated. Note that the silence internally is generated in raw signed linear format." ; \ + echo " ; This means that it must be transcoded into the native format of the channel before it can be sent" ; \ + echo " ; to the device. It is for this reason that this is optional, as it may result in requiring a" ; \ + echo " ; temporary codec translation path for a channel that may not otherwise require one." ; \ echo ";transcode_via_sln = yes ; Build transcode paths via SLINEAR, instead of directly" ; \ echo ";runuser = asterisk ; The user to run as" ; \ echo ";rungroup = asterisk ; The group to run as" ; \ |