[asterisk-commits] mnicholson: trunk r250302 - in /trunk: ./ apps/ res/

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Wed Mar  3 09:39:45 2010
New Revision: 250302

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=250302
Log:
Updated CHANGES file to mention res_fax and res_fax_spandsp.

Also fixed MODULEINFO depends and conflicts for app_fax, res_fax, and res_fax_spandsp.

Modified:
    trunk/CHANGES
    trunk/apps/app_fax.c
    trunk/res/res_fax.c
    trunk/res/res_fax_spandsp.c

Modified: trunk/CHANGES
URL: http://svnview.digium.com/svn/asterisk/trunk/CHANGES?view=diff&rev=250302&r1=250301&r2=250302
==============================================================================
--- trunk/CHANGES (original)
+++ trunk/CHANGES Wed Mar  3 09:39:45 2010
@@ -393,6 +393,13 @@
    coming soon.  For more information on the security events framework, see the
    "Security Events" chapter of the included documentation - doc/tex/asterisk.pdf.
 
+Fax
+---
+ * A technology independent fax frontend (res_fax) has been added to Asterisk.
+ * A spandsp based fax backend (res_fax_spandsp) has been added.
+ * The app_fax module has been deprecated in favor of the res_fax module and
+   the new res_fax_spandsp backend.
+
 Miscellaneous
 -------------
  * The transmit_silence_during_record option in asterisk.conf.sample has been removed.

Modified: trunk/apps/app_fax.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_fax.c?view=diff&rev=250302&r1=250301&r2=250302
==============================================================================
--- trunk/apps/app_fax.c (original)
+++ trunk/apps/app_fax.c Wed Mar  3 09:39:45 2010
@@ -13,7 +13,9 @@
  */
 
 /*** MODULEINFO
-	 <depend>spandsp</depend>
+	<defaultenabled>no</defaultenabled>
+	<depend>spandsp</depend>
+	<conflict>res_fax</conflict>
 ***/
  
 #include "asterisk.h"

Modified: trunk/res/res_fax.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_fax.c?view=diff&rev=250302&r1=250301&r2=250302
==============================================================================
--- trunk/res/res_fax.c (original)
+++ trunk/res/res_fax.c Wed Mar  3 09:39:45 2010
@@ -16,6 +16,10 @@
  * the GNU General Public License Version 2. See the LICENSE file
  * at the top of the source tree.
  */
+
+/*** MODULEINFO
+	<conflict>app_fax</conflict>
+***/
 
 /*! \file
  *

Modified: trunk/res/res_fax_spandsp.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_fax_spandsp.c?view=diff&rev=250302&r1=250301&r2=250302
==============================================================================
--- trunk/res/res_fax_spandsp.c (original)
+++ trunk/res/res_fax_spandsp.c Wed Mar  3 09:39:45 2010
@@ -26,7 +26,8 @@
  */
 
 /*** MODULEINFO
-		<depend>spandsp</depend>
+	<depend>spandsp</depend>
+	<depend>res_fax</depend>
 ***/
 
 #include "asterisk.h"