[Sumover-dev] [svn commit] r3755 - rat/trunk

[sumover-dev at cs.ucl.ac.uk]

Author: socrates
Date: Wed May 31 16:24:39 2006
New Revision: 3755

Modified:
   rat/trunk/ui_send_audio.c

Log:
Fixed earlier FreeBSD patch to work with Win32 I64 number. 

Modified: rat/trunk/ui_send_audio.c
==============================================================================
--- rat/trunk/ui_send_audio.c	(original)
+++ rat/trunk/ui_send_audio.c	Wed May 31 16:24:39 2006
@@ -279,8 +279,13 @@
 	if (sp->logger != NULL) {
 		struct timeval	t;
 		gettimeofday(&t, NULL);
+#ifdef WIN32
+		fprintf(sp->logger, "silence    %I64u.%06lu 0x%08lx %s\n", (__int64)t.tv_sec + SECS_BETWEEN_1900_1970, t.tv_usec, //SV-XXX: Win32
+		        (unsigned long) rtp_my_ssrc(sp->rtp_session[0]), name);
+#else
 		fprintf(sp->logger, "silence    %ju.%06lu 0x%08lx %s\n", (intmax_t)t.tv_sec + SECS_BETWEEN_1900_1970, t.tv_usec, //SV-XXX: FreeBSD
 		        (unsigned long) rtp_my_ssrc(sp->rtp_session[0]), name);
+#endif
 	}
 }
 
@@ -371,9 +376,15 @@
 	if (sp->logger != NULL) {
 		struct timeval	t;
 		gettimeofday(&t, NULL);
+#ifdef WIN32
+		fprintf(sp->logger, "channel    %I64u.%06lu 0x%08lx redundancy %s\n",
+		        (__int64)t.tv_sec + SECS_BETWEEN_1900_1970, t.tv_usec, //SV-XXX: Win32
+		        (unsigned long) rtp_my_ssrc(sp->rtp_session[0]), scf->long_name);
+#else
 		fprintf(sp->logger, "channel    %ju.%06lu 0x%08lx redundancy %s\n",
 		        (intmax_t)t.tv_sec + SECS_BETWEEN_1900_1970, t.tv_usec, //SV-XXX: FreeBSD
 		        (unsigned long) rtp_my_ssrc(sp->rtp_session[0]), scf->long_name);
+#endif
 	}
 
         out = (char*)xmalloc(clen);
@@ -453,8 +464,13 @@
 		if (sp->logger != NULL) {
 			struct timeval	t;
 			gettimeofday(&t, NULL);
+#ifdef WIN32
+			fprintf(sp->logger, "channel    %I64u.%06lu 0x%08lx none\n",
+				(__int64)t.tv_sec+SECS_BETWEEN_1900_1970, t.tv_usec, (unsigned long) rtp_my_ssrc(sp->rtp_session[0])); //SV-XXX: Win32
+#else
 			fprintf(sp->logger, "channel    %ju.%06lu 0x%08lx none\n",
 				(intmax_t)t.tv_sec+SECS_BETWEEN_1900_1970, t.tv_usec, (unsigned long) rtp_my_ssrc(sp->rtp_session[0])); //SV-XXX: FreeBSD
+#endif
 		}
                 break;
         case 'r':
@@ -485,9 +501,15 @@
 	if (sp->logger != NULL) {
 		struct timeval	t;
 		gettimeofday(&t, NULL);
+#ifdef WIN32
+		fprintf(sp->logger, "codec      %I64u.%06lu 0x%08lx %s\n",
+			(__int64)t.tv_sec+SECS_BETWEEN_1900_1970, t.tv_usec, (unsigned long) rtp_my_ssrc(sp->rtp_session[0]), //SV-XXX: Win32
+			pri_cf->long_name);
+#else
 		fprintf(sp->logger, "codec      %ju.%06lu 0x%08lx %s\n",
 			(intmax_t)t.tv_sec+SECS_BETWEEN_1900_1970, t.tv_usec, (unsigned long) rtp_my_ssrc(sp->rtp_session[0]), //SV-XXX: FreeBSD
 			pri_cf->long_name);
+#endif
 	}
 }