[Vm-dev] [commit] r2176 - Remove direct sound preference.

[commits at squeakvm.org]

Author: andreas
Date: 2010-04-03 10:56:17 -0700 (Sat, 03 Apr 2010)
New Revision: 2176

Modified:
   trunk/platforms/win32/vm/sqWin32.h
   trunk/platforms/win32/vm/sqWin32Prefs.c
   trunk/platforms/win32/vm/sqWin32Prefs.h
   trunk/platforms/win32/vm/sqWin32Window.c
Log:
Remove direct sound preference.

Modified: trunk/platforms/win32/vm/sqWin32.h
===================================================================
--- trunk/platforms/win32/vm/sqWin32.h	2010-04-03 17:54:34 UTC (rev 2175)
+++ trunk/platforms/win32/vm/sqWin32.h	2010-04-03 17:56:17 UTC (rev 2176)
@@ -301,7 +301,6 @@
 extern BOOL  fRunService;    /* Do we run as NT service? */
 extern BOOL  fBrowserMode;   /* Do we run in a web browser? */
 extern DWORD dwMemorySize;   /* How much memory do we use? */
-extern BOOL  fUseDirectSound;/* Do we use DirectSound?! */
 extern BOOL  fUseOpenGL;     /* Do we use OpenGL?! */
 extern BOOL fReduceCPUUsage; /* Should we reduce CPU usage? */
 extern BOOL fReduceCPUInBackground; /* reduce CPU usage when not active? */

Modified: trunk/platforms/win32/vm/sqWin32Prefs.c
===================================================================
--- trunk/platforms/win32/vm/sqWin32Prefs.c	2010-04-03 17:54:34 UTC (rev 2175)
+++ trunk/platforms/win32/vm/sqWin32Prefs.c	2010-04-03 17:56:17 UTC (rev 2176)
@@ -85,13 +85,6 @@
 			    f1ButtonMouse ? U_ON : U_OFF,squeakIniName);
 }
 
-void SetUseDirectSound() {
-  CheckMenuItem(vmPrefsMenu, ID_DIRECTSOUND, MF_BYCOMMAND | 
-		(fUseDirectSound ? MF_CHECKED : MF_UNCHECKED));
-  WritePrivateProfileString(U_GLOBAL,TEXT("UseDirectSound"),
-			    fUseDirectSound ? U_ON : U_OFF,squeakIniName);
-}
-
 void SetAllowFileAccess() {
   CheckMenuItem(vmPrefsMenu, ID_FILEACCESS, MF_BYCOMMAND | 
 		(ioHasFileAccess() ? MF_CHECKED : MF_UNCHECKED));
@@ -211,9 +204,6 @@
     GetPrivateProfileInt(U_GLOBAL,TEXT("PriorityBoost"),
 			 fPriorityBoost,squeakIniName);
 
-  fUseDirectSound   = 
-    GetPrivateProfileInt(U_GLOBAL,TEXT("UseDirectSound"),
-			 fUseDirectSound,squeakIniName);
   fUseOpenGL   = 
     GetPrivateProfileInt(U_GLOBAL,TEXT("B3DXUsesOpenGL"),
 			 fUseOpenGL,squeakIniName);
@@ -239,7 +229,6 @@
   SetReduceCPUInBackground();
   Set3ButtonMouse();
   Set1ButtonMouse();
-  SetUseDirectSound();
   SetAllowFileAccess();
   SetAllowImageWrite();
   SetAllowSocketAccess();
@@ -277,8 +266,6 @@
   }
   { /* Create media related menu */
     hMenu = CreatePopupMenu();
-    AppendMenu(hMenu, MF_STRING | MF_UNCHECKED, ID_DIRECTSOUND, 
-	       TEXT("Use DirectSound"));
     AppendMenu(hMenu, MF_STRING | MF_UNCHECKED, ID_USEOPENGL,
 	       TEXT("Use OpenGL (instead of D3D)"));
     AppendMenu(hMenu,MF_STRING | MF_UNCHECKED, ID_DEFERUPDATES, 
@@ -382,10 +369,6 @@
     f1ButtonMouse = !f1ButtonMouse;
     Set1ButtonMouse();
     break;
-  case ID_DIRECTSOUND:
-    fUseDirectSound = !fUseDirectSound;
-    SetUseDirectSound();
-    break;
   case ID_FILEACCESS:
     _ioSetFileAccess(!ioHasFileAccess());
     SetAllowFileAccess();

Modified: trunk/platforms/win32/vm/sqWin32Prefs.h
===================================================================
--- trunk/platforms/win32/vm/sqWin32Prefs.h	2010-04-03 17:54:34 UTC (rev 2175)
+++ trunk/platforms/win32/vm/sqWin32Prefs.h	2010-04-03 17:56:17 UTC (rev 2176)
@@ -14,7 +14,7 @@
 #define ID_SHOWALLOCATIONS 0x0090
 #define ID_REDUCEBACKGROUNDCPU 0x00A0
 #define ID_1BUTTONMOUSE 0x00B0
-#define ID_DIRECTSOUND 0x00C0
+/* #define ID_DIRECTSOUND 0x00C0 */
 
 #define ID_FILEACCESS 0x00D0
 #define ID_IMAGEWRITE 0x00E0

Modified: trunk/platforms/win32/vm/sqWin32Window.c
===================================================================
--- trunk/platforms/win32/vm/sqWin32Window.c	2010-04-03 17:54:34 UTC (rev 2175)
+++ trunk/platforms/win32/vm/sqWin32Window.c	2010-04-03 17:56:17 UTC (rev 2176)
@@ -97,7 +97,6 @@
 BOOL fShowAllocations = 0; /* Show allocation activity */
 BOOL fReduceCPUUsage = 1; /* Should we reduce CPU usage? */
 BOOL fReduceCPUInBackground = 0; /* Should we reduce CPU usage when not active? */
-BOOL fUseDirectSound = 1; /* Do we use DirectSound?! */
 BOOL fRunSingleApp = 0;   /* Do we allow only one instance of this VM? */
 
 #ifdef CROQUET