[asterisk-commits] tilghman: branch 1.4 r264248 - in /branches/1.4: ./ include/asterisk/

[SVN commits to the Asterisk project]

Author: tilghman
Date: Wed May 19 12:41:29 2010
New Revision: 264248

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=264248
Log:
Internal timing is now on by default, if you're using DAHDI 2.3 or above.

The reason for ensuring DAHDI 2.3 or above is that this version ensures that
a timer is always available, whereas in previous versions, it was possible
for DAHDI to be loaded, but have no drivers to actually generate timing.  If
internal_timing was turned on in this circumstance, a complete lack of audio
would result.  This is the reason why internal_timing was not on by default.
However, now that DAHDI ensures the availability of a timer, there is no
reason for this setting to be off (and in fact, it solves a great many initial
user problems).

(closes issue #15932)
 Reported by: dimas
 Patches: 
       20100519__issue15932.diff.txt uploaded by tilghman (license 14)
 Tested by: tilghman

Modified:
    branches/1.4/configure
    branches/1.4/configure.ac
    branches/1.4/include/asterisk/options.h

Modified: branches/1.4/configure.ac
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/configure.ac?view=diff&rev=264248&r1=264247&r2=264248
==============================================================================
--- branches/1.4/configure.ac (original)
+++ branches/1.4/configure.ac Wed May 19 12:41:29 2010
@@ -569,7 +569,9 @@
 fi
 
 if test "${USE_DAHDI}" != "no" ; then
-	AST_C_DEFINE_CHECK([DAHDI], [DAHDI_CODE], [dahdi/user.h])
+	AST_C_DEFINE_CHECK([DAHDI], [DAHDI_RESET_COUNTERS], [dahdi/user.h], [230])
+	AST_C_DEFINE_CHECK([DAHDI], [DAHDI_DEFAULT_MTU_MRU], [dahdi/user.h], [220])
+	AST_C_DEFINE_CHECK([DAHDI], [DAHDI_CODE], [dahdi/user.h], [200])
 	if test "x${PBX_DAHDI}" = "x1" ; then
 		PBX_DAHDI_TRANSCODE=1
 		AC_SUBST(PBX_DAHDI_TRANSCODE)

Modified: branches/1.4/include/asterisk/options.h
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/include/asterisk/options.h?view=diff&rev=264248&r1=264247&r2=264248
==============================================================================
--- branches/1.4/include/asterisk/options.h (original)
+++ branches/1.4/include/asterisk/options.h Wed May 19 12:41:29 2010
@@ -22,6 +22,8 @@
 
 #ifndef _ASTERISK_OPTIONS_H
 #define _ASTERISK_OPTIONS_H
+
+#include "asterisk/autoconfig.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
@@ -73,7 +75,7 @@
 	AST_OPT_FLAG_DONT_WARN = (1 << 18),
 	/*! End CDRs before the 'h' extension */
 	AST_OPT_FLAG_END_CDR_BEFORE_H_EXTEN = (1 << 19),
-	/*! Use Zaptel Timing for generators if available */
+	/*! Use DAHDI Timing for generators if available */
 	AST_OPT_FLAG_INTERNAL_TIMING = (1 << 20),
 	/*! Always fork, even if verbose or debug settings are non-zero */
 	AST_OPT_FLAG_ALWAYS_FORK = (1 << 21),
@@ -82,7 +84,11 @@
 };
 
 /*! These are the options that set by default when Asterisk starts */
+#if (defined(HAVE_DAHDI_VERSION) && HAVE_DAHDI_VERSION >= 230)
+#define AST_DEFAULT_OPTIONS AST_OPT_FLAG_TRANSCODE_VIA_SLIN | AST_OPT_FLAG_INTERNAL_TIMING
+#else
 #define AST_DEFAULT_OPTIONS AST_OPT_FLAG_TRANSCODE_VIA_SLIN
+#endif
 
 #define ast_opt_exec_includes		ast_test_flag(&ast_options, AST_OPT_FLAG_EXEC_INCLUDES)
 #define ast_opt_no_fork			ast_test_flag(&ast_options, AST_OPT_FLAG_NO_FORK)