--- SIDPlayer/src/main_sdl.cpp	2000/10/10 21:47:47	1.2
+++ SIDPlayer/src/main_sdl.cpp	2001/01/21 18:04:46	1.6
@@ -1,7 +1,7 @@
 /*
  *  main_sdl.cpp - SIDPlayer SDL main program
  *
- *  SIDPlayer (C) Copyright 1996-2000 Christian Bauer
+ *  SIDPlayer (C) Copyright 1996-2001 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
@@ -25,6 +25,8 @@
 #include <stdlib.h>
 
 #include "main.h"
+#include "prefs.h"
+#include "sid.h"
 
 
 /*
@@ -33,7 +35,8 @@
 
 static void usage(const char *prg_name)
 {
-	printf("\nUsage: %s FILE [song_number]]\n", prg_name);
+	printf("Usage: %s [OPTION...] FILE [song_number]]\n", prg_name);
+	PrefsPrintUsage();
 	exit(0);
 }
 
@@ -48,7 +51,7 @@ int main(int argc, char **argv)
 	// Print banner
 	printf(
 		PACKAGE " Version " VERSION "\n\n"
-		"Copyright (C) 1996-2000 Christian Bauer\n"
+		"Copyright (C) 1996-2001 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"
@@ -56,25 +59,36 @@ int main(int argc, char **argv)
 		"For details, see the file COPYING.\n\n"
 	);
 
-	// Parse arguments
-	if (argc < 2)
-		usage(argv[0]);
-	char *file_name = argv[1];
-	int song = 0;
-	if (argc == 3)
-		song = atoi(argv[2]);
-
 	// Initialize everything
 	if (SDL_Init(SDL_INIT_AUDIO) < 0) {
 		fprintf(stderr, "Couldn't initialize SDL (%s)\n", SDL_GetError());
 		exit(1);
 	}
 	atexit(quit);
-	InitAll();
+	InitAll(argc, argv);
+	int32 selected_speed = PrefsFindInt32("speed");
+
+	// Parse non-option arguments
+	if (argc < 2)
+		usage(argv[0]);
+	char *file_name = argv[argc - 1];
+	int song = 0;
+	if (argc >= 3) {
+		bool only_numbers = true;
+		for (int i=0; i<strlen(file_name); i++)
+			if (!isdigit(file_name[i])) {
+				only_numbers = false;
+				break;
+			}
+		if (only_numbers) {
+			song = atoi(file_name);
+			file_name = argv[argc - 2];
+		}
+	}
 
 	// Load given PSID file
-	if (!LoadPSIDFile(argv[1])) {
-		fprintf(stderr, "Couldn't load '%s' (not a PSID file?)\n", argv[1]);
+	if (!LoadPSIDFile(file_name)) {
+		fprintf(stderr, "Couldn't load '%s' (not a PSID file?)\n", file_name);
 		exit(1);
 	}
 
@@ -92,6 +106,7 @@ int main(int argc, char **argv)
 	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;