Merged revisions 372338,372341,372358 via svnmerge from

file:///srv/subversion/repos/asterisk/branches/10

................
  r372338 | kmoore | 2012-09-05 13:30:49 -0500 (Wed, 05 Sep 2012) | 13 lines

  Ensure counts generated in manager_show_dialplan_helper are correct

  When manager_show_dialplan_helper was written, the counter increment
  for the total number of contexts was placed with the extensions
  increment instead of in the enclosing loop.  This function should
  now generate correct context counts.

  (closes issue AST-970)
  Reported-by: John Bigelow
  ........

  Merged revisions 372337 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................
  r372341 | alecdavis | 2012-09-05 13:43:12 -0500 (Wed, 05 Sep 2012) | 7 lines

  dsp.c: in ast_mf_detect_init incorrectly sets goertzel samples to 160, should be MF_GSIZE

  Related https://reviewboard.asterisk.org/r/2097/
  ........

  Merged revisions 372339 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................
  r372358 | kmoore | 2012-09-05 14:22:08 -0500 (Wed, 05 Sep 2012) | 13 lines

  Correct documentation for ModuleLoad AMI action

  The documentation incorrectly listed 'rtp' as a reloadable subsystem
  and left out many other reloadable subsystems. It is now also
  documented that subsystems may only be reloaded, not loaded or
  unloaded.

  (closes issue AST-977)
  Reported-by: John Bigelow
  ........

  Merged revisions 372354 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10-digiumphones@372370 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/dsp.c b/main/dsp.c
index 7541650844bb0ab5784e562132136ba9920f71db..4272158ff5619679fc25a4cd352d69d4165eba96 100644 (file)
--- a/main/dsp.c
+++ b/main/dsp.c
@@ -312,7 +312,6 @@ static inline void goertzel_sample(goertzel_state_t *s, short sample)
                s->chunky++;
                s->v3 = s->v3 >> 1;
                s->v2 = s->v2 >> 1;
-               v1 = v1 >> 1;
        }
 }
 
@@ -502,7 +501,7 @@ static void ast_mf_detect_init (mf_detect_state_t *s, unsigned int sample_rate)
        int i;
        s->hits[0] = s->hits[1] = s->hits[2] = s->hits[3] = s->hits[4] = 0;
        for (i = 0;  i < 6;  i++) {
-               goertzel_init (&s->tone_out[i], mf_tones[i], 160, sample_rate);
+               goertzel_init (&s->tone_out[i], mf_tones[i], MF_SIZE, sample_rate);
        }
        s->current_sample = 0;
        s->current_hit = 0;

diff --git a/main/manager.c b/main/manager.c
index 4a50c0c72f9ac873bbb2d850ded0290da1b77647..4b791c02f4ed9619376818904e5825290793a4bc 100644 (file)
--- a/main/manager.c
+++ b/main/manager.c
@@ -687,16 +687,23 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                                <para>Asterisk module name (including .so extension) or subsystem identifier:</para>
                                <enumlist>
                                        <enum name="cdr" />
-                                       <enum name="enum" />
                                        <enum name="dnsmgr" />
                                        <enum name="extconfig" />
+                                       <enum name="enum" />
                                        <enum name="manager" />
-                                       <enum name="rtp" />
                                        <enum name="http" />
+                                       <enum name="logger" />
+                                       <enum name="features" />
+                                       <enum name="dsp" />
+                                       <enum name="udptl" />
+                                       <enum name="indications" />
+                                       <enum name="cel" />
+                                       <enum name="plc" />
                                </enumlist>
                        </parameter>
                        <parameter name="LoadType" required="true">
-                               <para>The operation to be done on module.</para>
+                               <para>The operation to be done on module. Subsystem identifiers may only
+                               be reloaded.</para>
                                <enumlist>
                                        <enum name="load" />
                                        <enum name="unload" />

diff --git a/main/pbx.c b/main/pbx.c
index f4cfb70d4e18da8511035a732a51a99a3fbdd854..c3b09981fc92f4045ee7d96ae4e77c731e9facf2 100644 (file)
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -7192,6 +7192,7 @@ static int manager_show_dialplan_helper(struct mansession *s, const struct messa
                        continue;       /* not the name we want */
 
                dpc->context_existence = 1;
+               dpc->total_context++;
 
                ast_debug(3, "manager_show_dialplan: Found Context: %s \n", ast_get_context_name(c));
 
@@ -7215,8 +7216,6 @@ static int manager_show_dialplan_helper(struct mansession *s, const struct messa
 
                        dpc->extension_existence = 1;
 
-                       /* may we print context info? */
-                       dpc->total_context++;
                        dpc->total_exten++;
 
                        p = NULL;               /* walk next extension peers */