sound options work better, and they save with the configuration now

src/drivers/win/OutputDS.cpp

@@ -1,3 +1,6 @@
+//this code is sloppily ripped from an unfinished sound system written for internal use by m.gambrell
+//it is released into the public domain and its stability is not warranted
+
 #include "oakra.h"
 
 #include "dsound.h"
@@ -64,7 +67,6 @@ public:
 		cPlay = 0;
 
 		hr = ds_buf->Play(0,0,DSBPLAY_LOOPING);
-		int xxx=9;
 	}
 	
 	//not supported

src/drivers/win/main.cpp

@@ -95,7 +95,12 @@ void ApplyDefaultCommandMapping(void);
 uint8 *xbsave = NULL;
 int eoptions = EO_BGRUN | EO_FORCEISCALE;
 
+//global variables
 int soundoptions = SO_SECONDARY | SO_GFOCUS;
+int soundrate = 44100;
+int soundbuftime = 50;
+int soundvolume = 100;
+int soundquality = 0;
 
 /** 
 * Contains the names of the overridden standard directories

src/drivers/win/main.h

@@ -54,10 +54,12 @@ static double winsizemulx = 1, winsizemuly = 1;
 static int winwidth, winheight;
 static int ismaximized = 0;
 
-static int soundrate = 44100;
+extern int soundoptions;
-static int soundbuftime = 50;
+extern int soundrate;
-static int soundvolume = 100;
+extern int soundbuftime;
-static int soundquality = 0;
+extern int soundvolume;
+extern int soundquality;
+
 static uint8 cpalette[192];
 //mbg 5/7/08 - I changed the ntsc settings to match pal.
 //this is more for precision emulation, instead of entertainment, which is what fceux is all about nowadays

src/drivers/win/sound.cpp

@@ -18,6 +18,10 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
+//todo - config synchronization guards
+//todo - use correct framerate instead of 60
+//todo - find out why fast forwarding at 96khz causes buffering to glitch?
+
 #include <list>
 #include "common.h"
 #include "main.h"
@@ -165,9 +169,9 @@ public:
 		int bufferSamples = buffers.length>>1;
 
 		//if we're we're too far behind, playback faster
-		if(bufferSamples > 44100*3/60) {
+		if(bufferSamples > soundrate*3/60) {
-			int behind = bufferSamples - 44100/60;
+			int behind = bufferSamples - soundrate/60;
-			incr = behind*256*60/44100/2;
+			incr = behind*256*60/soundrate/2;
 			//we multiply our playback rate by 1/2 the number of frames we're behind
 		}
 		if(incr<256) printf("OHNO -- %d -- shouldnt be less than 256!\n",incr); //sanity check: should never be less than 256
@@ -206,8 +210,8 @@ public:
 			dsout->lock();
 			int remain = buffers.length>>1;
 			dsout->unlock();
-			if(remain<44100/60) break;
+			if(remain<soundrate/60) break;
-			//if(remain<44100*scale/256/60) break; ??
+			//if(remain<soundrate*scale/256/60) break; ??
 			Sleep(1);
 		}
 	}
@@ -249,10 +253,6 @@ public:
 	}
 };
 
-//todo - a properly synchronized method ShouldntTouchSound() which is totally safe (use mutexes) and use that to guard all sound code
-//also add an alternate timer-based throttler for when sound is disabled
-
-
 static Player *player;
 static Player8 *player8;
 
@@ -303,7 +303,7 @@ void win_SoundInit(int bits) {
 	OAKRA_Format fmt;
 	fmt.format = bits==8?OAKRA_U8:OAKRA_S16;
 	fmt.channels = 1;
-	fmt.rate = 44100;
+	fmt.rate = soundrate;
 	fmt.size = OAKRA_Module::calcSize(fmt);
 	OAKRA_Voice *voice = dsout->getVoice(fmt);
 
@@ -318,23 +318,25 @@ void win_SoundInit(int bits) {
 
 
 int InitSound() {
-	if(soundoptions&SO_FORCE8BIT)
 	bits = 8;
-	else {
+
+	if(!(soundoptions&SO_FORCE8BIT))
+	{
 		//no modern system should have this problem, and we dont use primary buffer
 		/*if( (!(dscaps.dwFlags&DSCAPS_PRIMARY16BIT) && !(soundoptions&SO_SECONDARY)) ||
 		(!(dscaps.dwFlags&DSCAPS_SECONDARY16BIT) && (soundoptions&SO_SECONDARY)))
-		{
 		FCEUD_PrintError("DirectSound: 16-bit sound is not supported.  Forcing 8-bit sound.");*/
+
+		//if(dscaps.dwFlags&DSCAPS_SECONDARY16BIT)
 			bits = 16;
+		//else 
+		//	FCEUD_PrintError("DirectSound: 16-bit sound is not supported.  Forcing 8-bit sound.")
 	}
-	bits = 8;
 
 	win_SoundInit(bits);
 
 	FCEUI_Sound(soundrate);
 	return 1;
-	//  FCEUD_PrintError("DirectSound: Sound device is being emulated through waveform-audio functions.  Sound quality will most likely be awful.  Try to update your sound device's sound drivers.");
 }
 
 
@@ -533,9 +535,7 @@ BOOL CALLBACK SoundConCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
 	return 0;
 }
 
-/**
+/// Shows the sounds configuration dialog.
-* Shows the sounds configuration dialog.
-**/
 void ConfigSound()
 {
 	if(!uug)