--- SIDPlayer/src/main_sdl.cpp	2000/10/10 21:47:47	1.2
+++ SIDPlayer/src/main_sdl.cpp	2001/01/04 19:54:13	1.3
@@ -33,7 +33,7 @@
 
 static void usage(const char *prg_name)
 {
-	printf("\nUsage: %s FILE [song_number]]\n", prg_name);
+	printf("\nUsage: %s [options] FILE [song_number]]\n", prg_name);
 	exit(0);
 }
 
@@ -59,10 +59,20 @@ int main(int argc, char **argv)
 	// Parse arguments
 	if (argc < 2)
 		usage(argv[0]);
-	char *file_name = argv[1];
+	char *file_name = argv[argc - 1];
 	int song = 0;
-	if (argc == 3)
-		song = atoi(argv[2]);
+	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];
+		}
+	}
 
 	// Initialize everything
 	if (SDL_Init(SDL_INIT_AUDIO) < 0) {
@@ -70,11 +80,11 @@ int main(int argc, char **argv)
 		exit(1);
 	}
 	atexit(quit);
-	InitAll();
+	InitAll(argc, argv);
 
 	// 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);
 	}