Sound quality setting.

Author: Franticware

src/main.cpp

@@ -272,7 +272,11 @@ int my_main (int argc, char** argv)
 
     set_gfx_mode(GFX_TEXT, 0, 0, 0, 0);
 
-    int digi = settings.get("enable_sound") ? DIGI_AUTODETECT : DIGI_NONE;
+    const int sound_quality = settings.get("sound_quality");
+
+    int digi = sound_quality ? DIGI_AUTODETECT : DIGI_NONE;
+
+    MA_freq = 11025 * sound_quality;
 
     if (install_sound(digi, MIDI_NONE, NULL) != 0)
     {

src/minial.cpp

@@ -18,9 +18,11 @@
 #define MA_FILTER_HIGH_QUALITY 2
 
 #define MA_FILTER MA_FILTER_LINEAR
-#define MA_FREQ 22050
+//#define MA_FREQ 22050
 #define MA_SAMPLES 1024
 
+int MA_freq = 0;
+
 struct ALCdevice
 {
     ALuint dummy;
@@ -201,7 +203,10 @@ ALCdevice* alcOpenDevice(const ALCchar *devicename)
     floatBuff = new std::vector<float>;
     floatBuff->resize(MA_SAMPLES);
 
-    stream = play_audio_stream(MA_SAMPLES, 16, FALSE, MA_FREQ, 255, 128);
+    if (MA_freq)
+    {
+        stream = play_audio_stream(MA_SAMPLES, 16, FALSE, MA_freq, 255, 128);
+    }
 
 #if 0
     SDL_AudioSpec as;
@@ -240,8 +245,11 @@ ALCboolean alcCloseDevice(ALCdevice *device)
 {
     (void)device;
     //SDL_CloseAudio();
-    stop_audio_stream(stream);
-    stream = 0;
+    if (stream)
+    {
+        stop_audio_stream(stream);
+        stream = 0;
+    }
 
     delete sourceMap;
     sourceMap = 0;
@@ -312,10 +320,10 @@ void alListenerfv(ALenum param, const ALfloat *values)
 
 void alBufferData(ALuint buffer, ALenum format, const ALvoid *data, ALsizei size, ALsizei freq)
 {
-    if (buffer == 0 || bufferMap == 0 || format != AL_FORMAT_MONO16) return; // only 16-bit mono audio is currently supported
+    if (buffer == 0 || bufferMap == 0 || format != AL_FORMAT_MONO16 || MA_freq == 0) return; // only 16-bit mono audio is currently supported
     SDL_LockAudio();
     MA_Buffer& buff = (*bufferMap)[buffer];
-    buff.pitch = float(freq)/float(MA_FREQ);
+    buff.pitch = float(freq)/float(MA_freq);
     buff.samples.resize(size >> 1);
     std::copy((Sint16*)data, ((Sint16*)data) + buff.samples.size(), buff.samples.begin());
     SDL_UnlockAudio();

src/minial.h

@@ -56,5 +56,6 @@ void alSourceRewind(ALuint source);
 void alSourceStop(ALuint source);
 
 void MA_periodicStream(void);
+extern int MA_freq;
 
 #endif // MINIAL_H

src/settings_dat.cpp

@@ -9,31 +9,31 @@
 
     // name,     default, min, max, comment
 const Sett_entry_base entry_base[] = {
-    {"fullscreen", 0, 0, 1, "0 - windowed, 1 - fullscreen"},
-    {"screen_x", 640, 0, UINT_MAX, "screen resolution"},
-    {"screen_y", 480, 0, UINT_MAX, ""},
-    {"vsync", 0, 0, 1, "0 - vsync off, 1 - vsync on"},
-    {"antialiasing", 0, 0, 0, "0 - off"},
-    {"hq_textures", 0, 0, 1, "0 - lower details, 1 - higher details"},
-    {"texture_filter", 0, 0, 1, "0 - bilinear, 1 - trilinear"},
-    {"mipmaps", 0, 0, 1, "0 - mipmaps off, 1 - mipmaps on"},
-    {"view_distance", 0, 0, 10, "10 - far (best), 0 - near"},
-    {"show_fps", 1, 0, 1, "0 - fps counter off, 1 - fps counter on"},
-    {"enable_sound", 1, 0, 1, "0 - disable, 1 - enable"},
-    {"sound_volume", 100, 0, 100, "0 - 100"},
-    {"last_laps", 3, 1, 50, "last session"},
-    {"last_daytime", 0, 0, 1, "0 - day, 1 - evening"},
-    {"last_track", 0, 0, UINT_MAX, ""},
-    {"last_direction", 0, 0, 1, "0 - regular, 1 - reversed"},
-    {"last_players", 2, 1, 4, ""},
-    {"last_carsel1", 0, 0, UINT_MAX, ""},
-    {"last_cartex1", 0, 0, UINT_MAX, ""},
-    {"last_carsel2", 0, 0, UINT_MAX, ""},
-    {"last_cartex2", 1, 0, UINT_MAX, ""},
-    {"last_carsel3", 0, 0, UINT_MAX, ""},
-    {"last_cartex3", 2, 0, UINT_MAX, ""},
-    {"last_carsel4", 0, 0, UINT_MAX, ""},
-    {"last_cartex4", 3, 0, UINT_MAX, ""},
+    {"fullscreen",      1,      0, 1,           "0 - windowed, 1 - fullscreen"},
+    {"screen_x",        640,    0, UINT_MAX,    "screen resolution"},
+    {"screen_y",        480,    0, UINT_MAX,    ""},
+    {"vsync",           0,      0, 1,           "0 - vsync off, 1 - vsync on"},
+    {"antialiasing",    0,      0, 0,           "0 - off"},
+    {"hq_textures",     0,      0, 1,           "0 - lower details, 1 - higher details"},
+    {"texture_filter",  0,      0, 1,           "0 - bilinear, 1 - trilinear"},
+    {"mipmaps",         0,      0, 1,           "0 - mipmaps off, 1 - mipmaps on"},
+    {"view_distance",   0,      0, 10,          "10 - far (best), 0 - near"},
+    {"show_fps",        1,      0, 1,           "0 - fps counter off, 1 - fps counter on"},
+    {"sound_quality",   2,      0, 2,           "0 - off, 1 - low quality, 2 - normal quality"},
+    {"sound_volume",    100,    0, 100,         "0 - 100"},
+    {"last_laps",       3,      1, 50,          "last session"},
+    {"last_daytime",    0,      0, 1,           "0 - day, 1 - evening"},
+    {"last_track",      0,      0, UINT_MAX,    ""},
+    {"last_direction",  0,      0, 1,           "0 - regular, 1 - reversed"},
+    {"last_players",    2,      1, 4,           ""},
+    {"last_carsel1",    0,      0, UINT_MAX,    ""},
+    {"last_cartex1",    0,      0, UINT_MAX,    ""},
+    {"last_carsel2",    0,      0, UINT_MAX,    ""},
+    {"last_cartex2",    1,      0, UINT_MAX,    ""},
+    {"last_carsel3",    0,      0, UINT_MAX,    ""},
+    {"last_cartex3",    2,      0, UINT_MAX,    ""},
+    {"last_carsel4",    0,      0, UINT_MAX,    ""},
+    {"last_cartex4",    3,      0, UINT_MAX,    ""},
     };
 
 const char* Settings::controlNames[16] = {