SAM: Delete dead code and linux/windows specific code. Rename main to avoid symbol clash.

markshannon · ntoll · commit 5bfbb09d6cee · 2016-07-17T11:17:23.000+01:00
diff --git a/source/lib/sam/main.c b/source/lib/sam/main.c
@@ -7,45 +7,6 @@
 #include "sam.h"
 #include "debug.h"
 
-#ifdef USESDL
-#include <SDL.h>
-#include <SDL_audio.h>
-#endif
-
-void WriteWav(char* filename, char* buffer, int bufferlength)
-{
-	FILE *file = fopen(filename, "wb");
-	if (file == NULL) return;
-	//RIFF header
-	fwrite("RIFF", 4, 1,file);
-	unsigned int filesize=bufferlength + 12 + 16 + 8 - 8;
-	fwrite(&filesize, 4, 1, file);
-	fwrite("WAVE", 4, 1, file);
-
-	//format chunk
-	fwrite("fmt ", 4, 1, file);
-	unsigned int fmtlength = 16;
-	fwrite(&fmtlength, 4, 1, file);
-	unsigned short int format=1; //PCM
-	fwrite(&format, 2, 1, file);
-	unsigned short int channels=1;
-	fwrite(&channels, 2, 1, file);
-	unsigned int samplerate = 22050;
-	fwrite(&samplerate, 4, 1, file);
-	fwrite(&samplerate, 4, 1, file); // bytes/second
-	unsigned short int blockalign = 1;
-	fwrite(&blockalign, 2, 1, file);
-	unsigned short int bitspersample=8;
-	fwrite(&bitspersample, 2, 1, file);
-
-	//data chunk
-	fwrite("data", 4, 1, file);
-	fwrite(&bufferlength, 4, 1, file);
-	fwrite(buffer, bufferlength, 1, file);
-
-	fclose(file);
-}
-
 void PrintUsage()
 {
 	printf("usage: sam [options] Word1 Word2 ....\n");
@@ -92,63 +53,9 @@ void PrintUsage()
 	printf("Q            kitt-en (glottal stop)    /H        a(h)ead	\n");	
 }
 
-#ifdef USESDL
-
-int pos = 0;
-void MixAudio(void *unused, Uint8 *stream, int len)
-{
-	int bufferpos = GetBufferLength();
-	char *buffer = GetBuffer();
-	int i;
-	if (pos >= bufferpos) return;
-	if ((bufferpos-pos) < len) len = (bufferpos-pos);
-	for(i=0; i<len; i++)
-	{
-		stream[i] = buffer[pos];
-		pos++;
-	}
-}
-
-
-void OutputSound()
-{
-	int bufferpos = GetBufferLength();
-	bufferpos /= 50;
-	SDL_AudioSpec fmt;
-
-	fmt.freq = 22050;
-	fmt.format = AUDIO_U8;
-	fmt.channels = 1;
-	fmt.samples = 2048;
-	fmt.callback = MixAudio;
-	fmt.userdata = NULL;
-
-	/* Open the audio device and start playing sound! */
-	if ( SDL_OpenAudio(&fmt, NULL) < 0 ) 
-	{
-		printf("Unable to open audio: %s\n", SDL_GetError());
-		exit(1);
-	}
-	SDL_PauseAudio(0);
-	//SDL_Delay((bufferpos)/7);
-	
-	while (pos < bufferpos)
-	{
-		SDL_Delay(100);
-	}
-	
-	SDL_CloseAudio();
-}
-
-#else
-
-void OutputSound() {}
-
-#endif	
-
 int debug = 0;
 
-int main(int argc, char **argv)
+int sam_main(int argc, char **argv)
 {
 	int i;
 	int phonetic = 0;
@@ -236,28 +143,13 @@ int main(int argc, char **argv)
 			printf("phonetic input: %s\n", input);
 	} else strncat(input, "\x9b", 256);
 
-#ifdef USESDL
-	if ( SDL_Init(SDL_INIT_AUDIO) < 0 ) 
-	{
-		printf("Unable to init SDL: %s\n", SDL_GetError());
-		exit(1);
-	}
-	atexit(SDL_Quit);
-#endif
-
 	SetInput(input);
 	if (!SAMMain())
 	{
 		PrintUsage();
 		return 1;
 	}
 	
-	if (wavfilename != NULL) 
-		WriteWav(wavfilename, GetBuffer(), GetBufferLength()/50);
-	else
-		OutputSound();
-
-	
 	return 0;
 
 }
diff --git a/source/lib/sam/render.c b/source/lib/sam/render.c
@@ -51,7 +51,11 @@ unsigned char trans(unsigned char mem39212, unsigned char mem39213);
 extern int bufferpos;
 extern char *buffer;
 
-
+/** Scaling c64 rate to sample rate */
+// Rate for 22.05kHz
+// #define SCALE_RATE(x) (((x)*1310)>>16)
+// Rate for 7.8125KHz
+#define SCALE_RATE(x) (((x)*464)>>16)
 
 //timetable for more accurate c64 simulation
 int timetable[5][5] =
@@ -71,7 +75,7 @@ void Output(int index, unsigned char A)
 	oldtimetableindex = index;
 	// write a little bit in advance
 	for(k=0; k<5; k++)
-		buffer[bufferpos/50 + k] = (A & 15)*16;
+		buffer[SCALE_RATE(bufferpos) + k] = (A & 15)*16;
 }
 
 
@@ -869,59 +873,7 @@ if (debug)
 		// the sample for the phoneme.
 		RenderSample(&mem66);
 		goto pos48159;
-	} //while
-
-
-    // The following code is never reached. It's left over from when
-    // the voiced sample code was part of this loop, instead of part
-    // of RenderSample();
-
-	//pos48315:
-	int tempA;
-	phase1 = A ^ 255;
-	Y = mem66;
-	do
-	{
-		//pos48321:
-
-		mem56 = 8;
-		A = Read(mem47, Y);
-
-		//pos48327:
-		do
-		{
-			//48327: ASL A
-			//48328: BCC 48337
-			tempA = A;
-			A = A << 1;
-			if ((tempA & 128) != 0)
-			{
-				X = 26;
-				// mem[54296] = X;
-				bufferpos += 150;
-				buffer[bufferpos/50] = (X & 15)*16;
-			} else
-			{
-				//mem[54296] = 6;
-				X=6; 
-				bufferpos += 150;
-				buffer[bufferpos/50] = (X & 15)*16;
-			}
-
-			for(X = wait2; X>0; X--); //wait
-			mem56--;
-		} while(mem56 != 0);
-
-		Y++;
-		phase1++;
-
-	} while (phase1 != 0);
-	//	if (phase1 != 0) goto pos48321;
-	A = 1;
-	mem44 = 1;
-	mem66 = Y;
-	Y = mem49;
-	return;
+	}
 }
 
 
