--- SIDPlayer/src/main_sdl.cpp	2001/04/01 12:13:49	1.8
+++ SIDPlayer/src/main_sdl.cpp	2003/04/11 20:23:02	1.11
@@ -1,7 +1,7 @@
 /*
  *  main_sdl.cpp - SIDPlayer SDL main program
  *
- *  SIDPlayer (C) Copyright 1996-2001 Christian Bauer
+ *  SIDPlayer (C) Copyright 1996-2003 Christian Bauer
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -21,8 +21,16 @@
 #include "sys.h"
 
 #include <SDL.h>
+#include <SDL/SDL_endian.h>
+
 #include <stdio.h>
 #include <stdlib.h>
+#include <errno.h>
+
+#ifdef __unix__
+#include <unistd.h>
+#include <sys/time.h>
+#endif
 
 #include "main.h"
 #include "prefs.h"
@@ -30,6 +38,65 @@
 
 
 /*
+ *  Get current value of microsecond timer
+ */
+
+uint64 GetTicks_usec(void)
+{
+#ifdef __unix__
+	struct timeval t;
+	gettimeofday(&t, NULL);
+	return uint64(t.tv_sec) * 1000000 + t.tv_usec;
+#else
+	return uint64(SDL_GetTicks()) * 1000;
+#endif
+}
+
+
+/*
+ *  Delay by specified number of microseconds (<1 second)
+ *  (adapted from SDL_Delay() source)
+ */
+
+void Delay_usec(uint32 usec)
+{
+#ifdef __unix__
+	int was_error;
+#ifndef __linux__	/* Non-Linux implementations need to calculate time left */
+	uint64 then, now, elapsed;
+#endif
+	struct timeval tv;
+
+	/* Set the timeout interval - Linux only needs to do this once */
+#ifdef __linux__
+	tv.tv_sec = 0;
+	tv.tv_usec = usec;
+#else
+	then = GetTicks_usec();
+#endif
+	do {
+		errno = 0;
+#ifndef __linux__
+		/* Calculate the time interval left (in case of interrupt) */
+		now = GetTicks_usec();
+		elapsed = (now-then);
+		then = now;
+		if ( elapsed >= usec ) {
+			break;
+		}
+		usec -= elapsed;
+		tv.tv_sec = 0;
+		tv.tv_usec = usec;
+#endif
+		was_error = select(0, NULL, NULL, NULL, &tv);
+	} while (was_error && (errno == EINTR));
+#else
+	SDL_Delay(usec / 1000);
+#endif
+}
+
+
+/*
  *  Main program
  */
 
@@ -51,7 +118,7 @@ int main(int argc, char **argv)
 	// Print banner
 	printf(
 		PACKAGE " Version " VERSION "\n\n"
-		"Copyright (C) 1996-2001 Christian Bauer\n"
+		"Copyright (C) 1996-2003 Christian Bauer\n"
 		"E-mail: Christian.Bauer@uni-mainz.de\n"
 		"http://www.uni-mainz.de/~bauec002/\n\n"
 		"This is free software with ABSOLUTELY NO WARRANTY.\n"
@@ -66,7 +133,7 @@ int main(int argc, char **argv)
 	}
 	atexit(quit);
 	InitAll(argc, argv);
-	int32 selected_speed = PrefsFindInt32("speed");
+	int32 speed = PrefsFindInt32("speed");
 
 	// Parse non-option arguments
 	const char *file_name = NULL;
@@ -100,22 +167,97 @@ int main(int argc, char **argv)
 		SelectSong(song - 1);
 	}
 
+	SIDAdjustSpeed(speed); // SelectSong and LoadPSIDFile() reset this to 100%
+
 	// Print file information
 	printf("Module Name: %s\n", module_name);
 	printf("Author     : %s\n", author_name);
 	printf("Copyright  : %s\n\n", copyright_info);
 	printf("Playing song %d/%d\n", current_song + 1, number_of_songs);
 
-	// Start replay and enter main loop
-	SIDAdjustSpeed(selected_speed);	// SelectSong resets this to 100%
-	SDL_PauseAudio(false);
-	while (true) {
-		SDL_Event e;
-		if (SDL_WaitEvent(&e)) {
-			if (e.type == SDL_QUIT)
-				break;
+	// Replay or output to file?
+	const char *outfile = PrefsFindString("outfile");
+	if (outfile) {
+
+		// Open file
+		SDL_RWops *f = SDL_RWFromFile(outfile, "wb");
+		if (f == NULL) {
+			fprintf(stderr, "Can't open '%s' for writing (%s)\n", outfile, strerror(errno));
+			exit(1);
+		}
+
+		// Get format information
+		int32 channels = (PrefsFindBool("stereo") ? 2 : 1);
+		int32 bits = (PrefsFindBool("audio16bit") ? 16 : 8);
+		int32 rate = PrefsFindInt32("samplerate");
+		int32 time = PrefsFindInt32("time");
+		int32 bytes_per_frame = channels * (bits / 8);
+		int32 bytes_per_second = rate * bytes_per_frame;
+		int32 data_length = time * bytes_per_second;
+
+		// Write header
+		SDL_WriteLE32(f, 0x46464952); // "RIFF"
+		SDL_WriteLE32(f, 36 + data_length);
+		SDL_WriteLE32(f, 0x45564157); // "WAVE"
+		SDL_WriteLE32(f, 0x20746D66); // "fmt "
+		SDL_WriteLE32(f, 16);
+		SDL_WriteLE16(f, 1);
+		SDL_WriteLE16(f, channels);
+		SDL_WriteLE32(f, rate);
+		SDL_WriteLE32(f, bytes_per_second);
+		SDL_WriteLE16(f, bytes_per_frame);
+		SDL_WriteLE16(f, bits);
+		SDL_WriteLE32(f, 0x61746164); // "data"
+		SDL_WriteLE32(f, data_length);
+
+		// Calculate sound and write to file
+		uint8 *buf = new uint8[bytes_per_second];
+		for (int i=0; i<time; i++) {
+			SIDCalcBuffer(buf, bytes_per_second);
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+			if (bits > 8) {
+				// WAV file is little-endian, swap audio data
+				for (int b=0; b<bytes_per_second; b+=2) {
+					uint8 tmp = buf[b];
+					buf[b] = buf[b+1];
+					buf[b+1] = tmp;
+				}
+			}
+#endif
+			SDL_RWwrite(f, buf, bytes_per_second, 1);
+		}
+		delete[] buf;
+
+		// Close file
+		SDL_RWclose(f);
+		printf("Output written to '%s'\n", outfile);
+
+	} else if (PrefsFindBool("cwsid")) {
+
+		// Catweasel output, requires manual timing
+		while (true) {
+			SIDExecute();
+
+			SDL_Event e;
+			if (SDL_PollEvent(&e)) {
+				if (e.type == SDL_QUIT)
+					break;
+			}
+		}
+
+	} else {
+
+		// Start replay and enter main loop
+		SDL_PauseAudio(false);
+		while (true) {
+			SDL_Event e;
+			if (SDL_WaitEvent(&e)) {
+				if (e.type == SDL_QUIT)
+					break;
+			}
 		}
 	}
 
+	ExitAll();
 	return 0;
 }