From 3dc257df600f2f1e9486a90f8ea1b4258be4c2e2 Mon Sep 17 00:00:00 2001
From: Bradley Bell <btb@icculus.org>
Date: Mon, 31 Mar 2003 19:52:02 +0000
Subject: [PATCH] Allow use of 22K sound samples

---
 arch/dos/digimm.c |  4 ++--
 arch/sdl/digi.c   |  6 +++---
 arch/win32/digi.c |  6 +++---
 main/inferno.c    | 16 ++++++++++++++--
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/arch/dos/digimm.c b/arch/dos/digimm.c
index 34087a7a..9416e3cc 100644
--- a/arch/dos/digimm.c
+++ b/arch/dos/digimm.c
@@ -268,7 +268,7 @@ MDRIVER *drv = &drv_sb;
 char allegro_error[128];
 
 int md_mode = DMODE_STEREO;
-int md_mixfreq = 11025;
+int md_mixfreq = digi_sample_rate; //11025;
 int md_dmabufsize = 1024;
 
 void install_int_ex(void (*)(), long speed);
@@ -288,7 +288,7 @@ int digi_init()
  //end edit by adb
 
  #if 0
- WaveSpec.freq = 11025;
+ WaveSpec.freq = digi_sample_rate; //11025;
  WaveSpec.format = AUDIO_U8 | AUDIO_STEREO;
  WaveSpec.samples = SOUND_BUFFER_SIZE;
  WaveSpec.callback = audio_mixcallback;
diff --git a/arch/sdl/digi.c b/arch/sdl/digi.c
index 62fd5af4..789a7bd7 100644
--- a/arch/sdl/digi.c
+++ b/arch/sdl/digi.c
@@ -1,4 +1,4 @@
-/* $Id: digi.c,v 1.9 2003-03-20 03:57:29 btb Exp $ */
+/* $Id: digi.c,v 1.10 2003-03-31 19:52:02 btb Exp $ */
 /*
  *
  * SDL digital audio support
@@ -29,7 +29,7 @@
 #include "newdemo.h"
 #include "kconfig.h"
 
-int digi_sample_rate=11025;
+int digi_sample_rate=SAMPLE_RATE_11K;
 
 //edited 05/17/99 Matt Mueller - added ifndef NO_ASM
 //added on 980905 by adb to add inline fixmul for mixer on i386
@@ -249,7 +249,7 @@ int digi_init()
  memset(SampleHandles, 255, sizeof(SampleHandles));
  //end edit by adb
 
- WaveSpec.freq = 11025;
+ WaveSpec.freq = digi_sample_rate; 
 //added/changed by Sam Lantinga on 12/01/98 for new SDL version
  WaveSpec.format = AUDIO_U8;
  WaveSpec.channels = 2;
diff --git a/arch/win32/digi.c b/arch/win32/digi.c
index a4977660..d22c22f1 100644
--- a/arch/win32/digi.c
+++ b/arch/win32/digi.c
@@ -134,7 +134,7 @@ int digi_init()
 	 waveformat.wFormatTag=WAVE_FORMAT_PCM;
 	 waveformat.wBitsPerSample=8;
 	 waveformat.nChannels = 1;
-	 waveformat.nSamplesPerSec = 11025;
+	 waveformat.nSamplesPerSec = digi_sample_rate; //11025;
 	 waveformat.nBlockAlign =
 	 waveformat.nChannels * (waveformat.wBitsPerSample/8);
 	 waveformat.nAvgBytesPerSec =
@@ -255,7 +255,7 @@ TryNextChannel:
  waveformat.wFormatTag=WAVE_FORMAT_PCM;
  waveformat.wBitsPerSample=8;
  waveformat.nChannels = 1;
- waveformat.nSamplesPerSec = 11025;
+ waveformat.nSamplesPerSec = digi_sample_rate; //11025;
  waveformat.nBlockAlign =
    waveformat.nChannels * (waveformat.wBitsPerSample/8);
  waveformat.nAvgBytesPerSec =
@@ -333,7 +333,7 @@ int digi_start_sound_object(int obj)
  waveformat.wFormatTag=WAVE_FORMAT_PCM;
  waveformat.wBitsPerSample=8;
  waveformat.nChannels = 1;
- waveformat.nSamplesPerSec = 11025;
+ waveformat.nSamplesPerSec = digi_sample_rate; // 11025;
  waveformat.nBlockAlign =
  waveformat.nChannels * (waveformat.wBitsPerSample/8);
  waveformat.nAvgBytesPerSec =
diff --git a/main/inferno.c b/main/inferno.c
index 1c15f9a7..aec8d1c5 100644
--- a/main/inferno.c
+++ b/main/inferno.c
@@ -1,4 +1,4 @@
-/* $Id: inferno.c,v 1.58 2003-03-21 23:13:25 btb Exp $ */
+/* $Id: inferno.c,v 1.59 2003-03-31 19:52:02 btb Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -1249,6 +1249,17 @@ int main(int argc,char **argv)
 	con_printf(CON_NORMAL, TXT_HELP, PROGNAME);		//help message has %s for program name
 	con_printf(CON_NORMAL, "\n");
 
+	//(re)added Mar 30, 2003 Micah Lieske - Allow use of 22K sound samples again.
+	if(FindArg("-sound22k"))
+	{
+		digi_sample_rate = SAMPLE_RATE_22K;
+	}
+
+	if(FindArg("-sound11k"))
+	{
+		digi_sample_rate = SAMPLE_RATE_11K;
+	}
+
 	arch_init_start();
 
 	arch_init();
@@ -1745,10 +1756,11 @@ int main(int argc,char **argv)
 
 	WriteConfigFile();
 
-#if 0 /* ????? */
+#if 0
 	#ifndef RELEASE
 	if (!FindArg( "-notitles" ))
 	#endif
+		show_order_form();
 #endif
 
 	#ifndef NDEBUG
-- 
2.39.2