Merge branch 'master' of git://git.freeswitch.org/freeswitch

libs/.gitignore

@@ -355,6 +355,7 @@
 /libsndfile/Cfg/missing
 /libsndfile/M4/Makefile
 /libsndfile/M4/Makefile.in
+/libsndfile/M4/lt~obsolete.m4
 /libsndfile/Makefile
 /libsndfile/Makefile.in
 /libsndfile/Octave/Makefile

libs/freetdm/src/libteletone_generate.c

@@ -267,7 +267,7 @@ TELETONE_API(int) teletone_mux_tones(teletone_generation_session_t *ts, teletone
 					ts->samples * 2);
 		}
 	}	
-	return ts->samples;
+	return ts->samples / ts->channels;
 }
 
 TELETONE_API(int) teletone_run(teletone_generation_session_t *ts, const char *cmd)

libs/libteletone/src/libteletone_generate.c

@@ -302,7 +302,7 @@ TELETONE_API(int) teletone_mux_tones(teletone_generation_session_t *ts, teletone
 					ts->samples * 2);
 		}
 	}	
-	return ts->samples;
+	return ts->samples / ts->channels;
 }
 
 /* don't ask */

libs/spandsp/src/spandsp/private/t30.h

@@ -60,10 +60,8 @@ struct t30_state_s
     int supported_t30_features;
     /*! \brief TRUE is ECM mode handling is enabled. */
     int ecm_allowed;
-#if 0
     /*! \brief TRUE if we are capable of retransmitting pages */
     int retransmit_capable;
-#endif
 
     /*! \brief The received DCS, formatted as an ASCII string, for inclusion
                in the TIFF file. */
@@ -71,12 +69,12 @@ struct t30_state_s
     /*! \brief The text which will be used in FAX page header. No text results
                in no header line. */
     char header_info[T30_MAX_PAGE_HEADER_INFO + 1];
-#if 0
     /*! \brief TRUE for FAX page headers to overlay (i.e. replace) the beginning of the
                page image. FALSE for FAX page headers to add to the overall length of
                the page. */
     int header_overlays_image;
-#endif
+    /*! \brief TRUE if remote T.30 procedural interrupts are allowed. */
+    int remote_interrupts_allowed;
 
     /*! \brief The information fields received. */
     t30_exchanged_info_t rx_info;
@@ -207,13 +205,6 @@ struct t30_state_s
     /*! \brief This is only used in full duplex (e.g. ISDN) modes. */
     int timer_t8;
 
-	/* These fields are guessed based on compiler error forensics, I added them to fix the build -anthm */
-	int remote_interrupts_allowed;
-	int rtp_events;
-	int rtn_events;
-	int retransmit_capable;
-	/* end guessed fields */
-
     /*! \brief TRUE once the far end FAX entity has been detected. */
     int far_end_detected;
 
@@ -283,12 +274,10 @@ struct t30_state_s
     /*! \brief The current completion status. */
     int current_status;
 
-#if 0
     /*! \brief The number of RTP events */
     int rtp_events;
     /*! \brief The number of RTN events */
     int rtn_events;
-#endif
 
     /*! \brief the FCF2 field of the last PPS message we received. */
     uint8_t last_pps_fcf2;

libs/spandsp/src/spandsp/t30.h

@@ -682,6 +682,10 @@ SPAN_DECLARE(void) t30_get_transfer_statistics(t30_state_t *s, t30_stats_t *t);
     \param state TRUE to enable interrupt request, else FALSE. */
 SPAN_DECLARE(void) t30_local_interrupt_request(t30_state_t *s, int state);
 
+/*! Allow remote interrupts of FAX exchange.
+    \brief Allow remote interrupts of FAX exchange.
+    \param s The T.30 context.
+    \param state TRUE to allow interruptd, else FALSE. */
 SPAN_DECLARE(void) t30_remote_interrupts_allowed(t30_state_t *s, int state);
 
 #if defined(__cplusplus)