[Mplayer-cvslog] CVS: main mplayer.c,1.501,1.502 cpudetect.c,1.19,1.20

[Arpi of Ize]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv2139

Modified Files:
	mplayer.c cpudetect.c 
Log Message:
more cpudetect cosmetics

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.501
retrieving revision 1.502
diff -u -r1.501 -r1.502
--- mplayer.c	20 May 2002 00:55:50 -0000	1.501
+++ mplayer.c	20 May 2002 01:00:51 -0000	1.502
@@ -536,8 +536,8 @@
   /* Test for cpu capabilities (and corresponding OS support) for optimizing */
 #ifdef ARCH_X86
   GetCpuCaps(&gCpuCaps);
-  mp_msg(MSGT_CPLAYER,MSGL_INFO,"CPUflags: Type: %d MMX: %d MMX2: %d 3DNow: %d 3DNow2: %d SSE: %d SSE2: %d\n",
-      gCpuCaps.cpuType,gCpuCaps.hasMMX,gCpuCaps.hasMMX2,
+  mp_msg(MSGT_CPLAYER,MSGL_INFO,"CPUflags:  MMX: %d MMX2: %d 3DNow: %d 3DNow2: %d SSE: %d SSE2: %d\n",
+      gCpuCaps.hasMMX,gCpuCaps.hasMMX2,
       gCpuCaps.has3DNow, gCpuCaps.has3DNowExt,
       gCpuCaps.hasSSE, gCpuCaps.hasSSE2);
 #ifdef RUNTIME_CPUDETECT
@@ -559,7 +559,10 @@
 #ifdef HAVE_SSE
   mp_msg(MSGT_CPLAYER,MSGL_INFO," SSE");
 #endif
-  mp_msg(MSGT_CPLAYER,MSGL_INFO,"\n");
+#ifdef HAVE_SSE2
+  mp_msg(MSGT_CPLAYER,MSGL_INFO," SSE2");
+#endif
+  mp_msg(MSGT_CPLAYER,MSGL_INFO,"\n\n");
 #endif
 
 #endif

Index: cpudetect.c
===================================================================
RCS file: /cvsroot/mplayer/main/cpudetect.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- cpudetect.c	20 May 2002 00:55:50 -0000	1.19
+++ cpudetect.c	20 May 2002 01:00:51 -0000	1.20
@@ -117,7 +117,7 @@
 		    caps->cpuType=8+((regs2[0]>>20)&255);
 		}
 		caps->cpuStepping=regs2[0] & 0xf;
-		mp_msg(MSGT_CPUDETECT,MSGL_INFO,"(Type: %d, Stepping: %d)\n",
+		mp_msg(MSGT_CPUDETECT,MSGL_INFO,"(Family: %d, Stepping: %d)\n",
 		    caps->cpuType, caps->cpuStepping);
 
 		// general feature flags: