Revision

15155

Author

anthm

Date

2009-10-13 17:29:20 -0500 (Tue, 13 Oct 2009)

Log Message

fix playback_ms and record_ms to work right and add playback_seconds and record_seconds

Modified Paths

• freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c
• freeswitch/trunk/src/switch_core_file.c
• freeswitch/trunk/src/switch_ivr_play_say.c

Diff

--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c	2009-10-13 21:52:47 UTC (rev 15154)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c	2009-10-13 22:29:20 UTC (rev 15155)
@@ -402,7 +402,7 @@
 
 	if ((uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE)) && (session_b = switch_core_session_locate(uuid))) {
 		switch_core_session_message_t *msg;
-
+		
 		msg = switch_core_session_alloc(session_b, sizeof(*msg));
 		MESSAGE_STAMP_FFL(msg);
 		msg->message_id = SWITCH_MESSAGE_INDICATE_DISPLAY;
@@ -468,6 +468,8 @@
 	caller_profile = switch_channel_get_caller_profile(channel);
 	caller_profile->callee_id_name = switch_core_strdup(caller_profile->pool, name);
 	caller_profile->callee_id_number = switch_core_strdup(caller_profile->pool, number);
+
+	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Update Callee ID to \"%s\" <%s>\n", name, number);
 	
 	if (send) {
 		sofia_send_callee_id(session, NULL, NULL);

--- freeswitch/trunk/src/switch_core_file.c	2009-10-13 21:52:47 UTC (rev 15154)
+++ freeswitch/trunk/src/switch_core_file.c	2009-10-13 22:29:20 UTC (rev 15155)
@@ -498,9 +498,11 @@
 				if ((blen = switch_buffer_read(fh->pre_buffer, fh->pre_buffer_data, fh->pre_buffer_datalen))) {
 					if (!asis) blen /= 2;
 					if (fh->channels > 1) blen /= fh->channels;
+					
 					if (fh->file_interface->file_write(fh, fh->pre_buffer_data, &blen) != SWITCH_STATUS_SUCCESS) {
 						break;
 					}
+					fh->samples_out += blen;
 				}
 			}
 		}

--- freeswitch/trunk/src/switch_ivr_play_say.c	2009-10-13 21:52:47 UTC (rev 15154)
+++ freeswitch/trunk/src/switch_ivr_play_say.c	2009-10-13 22:29:20 UTC (rev 15155)
@@ -715,10 +715,16 @@
 		switch_core_codec_destroy(&write_codec);
 	}
 
-	switch_channel_set_variable_printf(channel, "record_ms", "%d", fh->samples_in / read_impl.samples_per_second);
-	switch_channel_set_variable_printf(channel, "record_samples", "%d", fh->samples_in);
+	switch_core_file_close(fh);
 
-	switch_core_file_close(fh);
+	if (read_impl.samples_per_second)  {
+		switch_channel_set_variable_printf(channel, "record_seconds", "%d", fh->samples_out / read_impl.samples_per_second);
+		switch_channel_set_variable_printf(channel, "record_ms", "%d", fh->samples_out / (read_impl.samples_per_second / 1000));
+
+	}
+
+	switch_channel_set_variable_printf(channel, "record_samples", "%d", fh->samples_out);
+
 	switch_core_session_reset(session, SWITCH_TRUE, SWITCH_TRUE);
 	return status;
 }
@@ -1425,7 +1431,12 @@
 
 		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "done playing file\n");
 		
-		if (read_impl.samples_per_second) switch_channel_set_variable_printf(channel, "playback_ms", "%d", fh->samples_out / read_impl.samples_per_second);
+		if (read_impl.samples_per_second) {
+			switch_channel_set_variable_printf(channel, "playback_seconds", 
+											   "%d", fh->samples_out / read_impl.samples_per_second);
+			switch_channel_set_variable_printf(channel, "playback_ms", 
+											   "%d", fh->samples_out / (read_impl.samples_per_second / 1000) );
+		}
 		switch_channel_set_variable_printf(channel, "playback_samples", "%d", fh->samples_out);
 
 		switch_core_file_close(fh);