Maarten Lankhorst : dsound: Change default bpp and sample frequency to be better for the ears.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: aaa9e41fdfc9ed6f8531f93861a014593acff228
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=aaa9e41fdfc9ed6f8531f93861a014593acff228

Author: Maarten Lankhorst <m.b.lankhorst at gmail.com>
Date:   Fri Aug 31 18:21:14 2007 +0200

dsound: Change default bpp and sample frequency to be better for the ears.

---

 dlls/dsound/dsound_main.c |   12 ++++++------
 programs/winecfg/audio.c  |    4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c
index 770525c..791b33c 100644
--- a/dlls/dsound/dsound_main.c
+++ b/dlls/dsound/dsound_main.c
@@ -96,8 +96,8 @@ int ds_snd_queue_min = DS_SND_QUEUE_MIN;
 int ds_hw_accel = DS_HW_ACCEL_FULL;
 int ds_default_playback = 0;
 int ds_default_capture = 0;
-int ds_default_sample_rate = 22050;
-int ds_default_bits_per_sample = 8;
+int ds_default_sample_rate = 44100;
+int ds_default_bits_per_sample = 16;
 
 /*
  * Get a config key from either the app-specific or the default config
@@ -203,10 +203,10 @@ void setup_dsound_options(void)
 	WARN("ds_default_playback = %d (default=0)\n",ds_default_playback);
     if (ds_default_capture != 0)
 	WARN("ds_default_capture = %d (default=0)\n",ds_default_playback);
-    if (ds_default_sample_rate != 22050)
-        WARN("ds_default_sample_rate = %d (default=22050)\n",ds_default_sample_rate);
-    if (ds_default_bits_per_sample != 8)
-        WARN("ds_default_bits_per_sample = %d (default=8)\n",ds_default_bits_per_sample);
+    if (ds_default_sample_rate != 44100)
+        WARN("ds_default_sample_rate = %d (default=44100)\n",ds_default_sample_rate);
+    if (ds_default_bits_per_sample != 16)
+        WARN("ds_default_bits_per_sample = %d (default=16)\n",ds_default_bits_per_sample);
 }
 
 static const char * get_device_id(LPCGUID pGuid)
diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c
index e54aaa6..071c13d 100644
--- a/programs/winecfg/audio.c
+++ b/programs/winecfg/audio.c
@@ -692,7 +692,7 @@ static void initAudioDlg (HWND hDlg)
     for (i = 0; NULL != DSound_Rates[i]; ++i) {
       SendDlgItemMessage(hDlg, IDC_DSOUND_RATES, CB_ADDSTRING, 0, (LPARAM) DSound_Rates[i]);
     }
-    buf = get_reg_key(config_key, keypath("DirectSound"), "DefaultSampleRate", "22050");
+    buf = get_reg_key(config_key, keypath("DirectSound"), "DefaultSampleRate", "44100");
     for (i = 0; NULL != DSound_Rates[i]; ++i) {
       if (strcmp(buf, DSound_Rates[i]) == 0) {
 	SendDlgItemMessage(hDlg, IDC_DSOUND_RATES, CB_SETCURSEL, i, 0);
@@ -704,7 +704,7 @@ static void initAudioDlg (HWND hDlg)
     for (i = 0; NULL != DSound_Bits[i]; ++i) {
       SendDlgItemMessage(hDlg, IDC_DSOUND_BITS, CB_ADDSTRING, 0, (LPARAM) DSound_Bits[i]);
     }
-    buf = get_reg_key(config_key, keypath("DirectSound"), "DefaultBitsPerSample", "8");
+    buf = get_reg_key(config_key, keypath("DirectSound"), "DefaultBitsPerSample", "16");
     for (i = 0; NULL != DSound_Bits[i]; ++i) {
       if (strcmp(buf, DSound_Bits[i]) == 0) {
 	SendDlgItemMessage(hDlg, IDC_DSOUND_BITS, CB_SETCURSEL, i, 0);