[Freeswitch-svn] [commit] r10686 - freeswitch/trunk/src

[FreeSWITCH SVN]

Author: anthm
Date: Tue Dec  9 15:28:12 2008
New Revision: 10686

Log:
tweak

Modified:
   freeswitch/trunk/src/switch_ivr_originate.c
   freeswitch/trunk/src/switch_rtp.c

Modified: freeswitch/trunk/src/switch_ivr_originate.c
==============================================================================
--- freeswitch/trunk/src/switch_ivr_originate.c	(original)
+++ freeswitch/trunk/src/switch_ivr_originate.c	Tue Dec  9 15:28:12 2008
@@ -1490,12 +1490,12 @@
 						silence = 400;
 					}
 					
-					if (silence) {
-						write_frame.datalen = write_frame.codec->implementation->decoded_bytes_per_packet;
-						switch_generate_sln_silence((int16_t *) write_frame.data, write_frame.datalen / 2, silence);
-					}
-					
 					if ((ringback.fh || silence || ringback.audio_buffer) && write_frame.codec && write_frame.datalen) {
+						if (silence) {
+							write_frame.datalen = write_frame.codec->implementation->decoded_bytes_per_packet;
+							switch_generate_sln_silence((int16_t *) write_frame.data, write_frame.datalen / 2, silence);
+						}
+						
 						if (switch_core_session_write_frame(session, &write_frame, SWITCH_IO_FLAG_NONE, 0) != SWITCH_STATUS_SUCCESS) {
 							break;
 						}
@@ -1704,11 +1704,11 @@
 			}
 
 			if (session) {
-				switch_core_session_reset(session, SWITCH_FALSE);
+				//switch_core_session_reset(session, SWITCH_FALSE);
 			}
 
 			if (write_codec.implementation) {
-				switch_core_codec_destroy(&write_codec);
+				//switch_core_codec_destroy(&write_codec);
 			}
 
 			for (i = 0; i < and_argc; i++) {

Modified: freeswitch/trunk/src/switch_rtp.c
==============================================================================
--- freeswitch/trunk/src/switch_rtp.c	(original)
+++ freeswitch/trunk/src/switch_rtp.c	Tue Dec  9 15:28:12 2008
@@ -1906,7 +1906,7 @@
 			rtp_session->cn = 0;
 			m++;
 		}
-		
+
 		send_msg->header.m = m ? 1 : 0;
 
 		memcpy(send_msg->body, data, datalen);