Be nice if you could split this up and squash it into the previous patches.
Andrew On Tue, Oct 16, 2012 at 02:06:30PM +0200, Maarten Lankhorst wrote: > From: Maarten Lankhorst <maarten.lankho...@canonical.com> > > No longer influence anything, so zap them. > --- > dlls/dsound/dsound_main.c | 17 ----------------- > dlls/dsound/dsound_private.h | 4 ---- > 2 files changed, 21 deletions(-) > > diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c > index 3fded64..607c3d4 100644 > --- a/dlls/dsound/dsound_main.c > +++ b/dlls/dsound/dsound_main.c > @@ -29,7 +29,6 @@ > * Handle static buffers - put those in hardware, non-static not in > hardware > * Hardware DuplicateSoundBuffer > * Proper volume calculation for 3d buffers > - * Remove DS_HEL_FRAGS and use mixer fragment length for it > */ > > #include <stdarg.h> > @@ -92,9 +91,6 @@ WCHAR wine_vxd_drv[] = { > 'w','i','n','e','m','m','.','v','x','d', 0 }; > > /* All default settings, you most likely don't want to touch these, see wiki > on UsefulRegistryKeys */ > int ds_hel_buflen = 32768 * 2; > -int ds_snd_queue_max = 10; > -int ds_default_sample_rate = 44100; > -int ds_default_bits_per_sample = 16; > static HINSTANCE instance; > > /* > @@ -147,23 +143,10 @@ void setup_dsound_options(void) > if (!get_config_key( hkey, appkey, "HelBuflen", buffer, MAX_PATH )) > ds_hel_buflen = atoi(buffer); > > - if (!get_config_key( hkey, appkey, "SndQueueMax", buffer, MAX_PATH )) > - ds_snd_queue_max = atoi(buffer); > - > - > - if (!get_config_key( hkey, appkey, "DefaultSampleRate", buffer, MAX_PATH > )) > - ds_default_sample_rate = atoi(buffer); > - > - if (!get_config_key( hkey, appkey, "DefaultBitsPerSample", buffer, > MAX_PATH )) > - ds_default_bits_per_sample = atoi(buffer); > - > if (appkey) RegCloseKey( appkey ); > if (hkey) RegCloseKey( hkey ); > > TRACE("ds_hel_buflen = %d\n", ds_hel_buflen); > - TRACE("ds_snd_queue_max = %d\n", ds_snd_queue_max); > - TRACE("ds_default_sample_rate = %d\n", ds_default_sample_rate); > - TRACE("ds_default_bits_per_sample = %d\n", ds_default_bits_per_sample); > } > > static const char * get_device_id(LPCGUID pGuid) > diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h > index 7817b88..bdd3a37 100644 > --- a/dlls/dsound/dsound_private.h > +++ b/dlls/dsound/dsound_private.h > @@ -31,10 +31,6 @@ > #include "wine/list.h" > > extern int ds_hel_buflen DECLSPEC_HIDDEN; > -extern int ds_snd_queue_max DECLSPEC_HIDDEN; > -extern int ds_snd_shadow_maxsize DECLSPEC_HIDDEN; > -extern int ds_default_sample_rate DECLSPEC_HIDDEN; > -extern int ds_default_bits_per_sample DECLSPEC_HIDDEN; > > > /***************************************************************************** > * Predeclare the interface implementation structures > -- > 1.7.11.3 > > >