[asterisk-commits] dhubbard: branch 1.6.0 r177763 - in /branches/1.6.0: ./ apps/app_fax.c

[SVN commits to the Asterisk project]

Author: dhubbard
Date: Fri Feb 20 15:56:39 2009
New Revision: 177763

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=177763
Log:
Merged revisions 177699 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r177699 | dhubbard | 2009-02-20 14:29:00 -0600 (Fri, 20 Feb 2009) | 9 lines
  
  Make app_fax compatible with spandsp-0.0.6pre4
  
  Prior to spandsp-0.0.6pre4 the t30_stats_t structure used a pages_transferred
  integer to indicate the number of pages transferred (so far) during the fax
  session.  The spandsp-0.0.6pre4 release removed the pages_transferred integer
  and replaced it with two different integers - pages_tx and pages_rx.  This
  revision uses the new integers for spandsp-0.0.6pre4 while maintaining backwards
  compatibility for previous spandsp releases.
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_fax.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/apps/app_fax.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/apps/app_fax.c?view=diff&rev=177763&r1=177762&r2=177763
==============================================================================
--- branches/1.6.0/apps/app_fax.c (original)
+++ branches/1.6.0/apps/app_fax.c Fri Feb 20 15:56:39 2009
@@ -161,6 +161,7 @@
 	char buf[20];
 	fax_session *s = (fax_session *) user_data;
 	t30_stats_t stat;
+	int pages_transferred;
 
 	ast_debug(1, "Fax phase E handler. result=%d\n", result);
 
@@ -186,7 +187,12 @@
 	pbx_builtin_setvar_helper(s->chan, "FAXSTATUS", "SUCCESS"); 
 	pbx_builtin_setvar_helper(s->chan, "FAXERROR", NULL); 
 	pbx_builtin_setvar_helper(s->chan, "REMOTESTATIONID", far_ident);
-	snprintf(buf, sizeof(buf), "%d", stat.pages_transferred);
+#if SPANDSP_RELEASE_DATE >= 20090220
+	pages_transferred = (s->direction) ? stat.pages_tx : stat.pages_rx;
+#else
+	pages_transferred = stat.pages_transferred;
+#endif
+	snprintf(buf, sizeof(buf), "%d", pages_transferred);
 	pbx_builtin_setvar_helper(s->chan, "FAXPAGES", buf);
 	snprintf(buf, sizeof(buf), "%d", stat.y_resolution);
 	pbx_builtin_setvar_helper(s->chan, "FAXRESOLUTION", buf);
@@ -195,7 +201,7 @@
 	
 	ast_debug(1, "Fax transmitted successfully.\n");
 	ast_debug(1, "  Remote station ID: %s\n", far_ident);
-	ast_debug(1, "  Pages transferred: %d\n", stat.pages_transferred);
+	ast_debug(1, "  Pages transferred: %d\n", pages_transferred);
 	ast_debug(1, "  Image resolution:  %d x %d\n", stat.x_resolution, stat.y_resolution);
 	ast_debug(1, "  Transfer Rate:     %d\n", stat.bit_rate);
 	
@@ -215,7 +221,7 @@
 		      S_OR(s->chan->cid.cid_num, ""),
 		      far_ident,
 		      local_ident,
-		      stat.pages_transferred,
+		      pages_transferred,
 		      stat.y_resolution,
 		      stat.bit_rate,
 		      s->file_name);