Add test case and some fixes for re-entrancy.

Makefile

@@ -9,6 +9,11 @@ HEADERS = $(wildcard */*.h) $(wildcard *.h)
 LIBS = -lm
 DEFINES = -DHAVE_CONFIG_H
 
+ifeq ($(REENTRANT_TEST), 1)
+   DEFINES += -Dmain=ssnes_main
+   OBJ += console/test.o
+endif
+
 ifneq ($(findstring Darwin,$(OS)),)
    OSX := 1
    LIBS += -framework AppKit

console/test.c

@@ -0,0 +1,42 @@
+/*  SSNES - A Super Nintendo Entertainment System (SNES) Emulator frontend for libsnes.
+ *  Copyright (C) 2010-2012 - Hans-Kristian Arntzen
+ *
+ *  Some code herein may be based on code found in BSNES.
+ * 
+ *  SSNES is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  SSNES is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with SSNES.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// Test module to check re-entrancy of libsnes implementations.
+// Reruns SSNES main loop with all roms defined on command-line
+// to check if libsnes can load multiple roms after each other.
+
+#include "../getopt_ssnes.h"
+#include "../general.h"
+#include <string.h>
+
+int ssnes_main(int argc, char *argv[]);
+
+#undef main
+int main(int argc, char *argv[])
+{
+   while (ssnes_main(argc, argv) == 0)
+   {
+      if (optind + 1 >= argc)
+         return 0;
+
+      memmove(&argv[optind], &argv[optind + 1], (argc - optind - 1) * sizeof(char*));
+      argc--;
+
+      ssnes_main_clear_state();
+   }
+}
+

driver.c

@@ -258,10 +258,6 @@ static void deinit_dsp_plugin(void)
 
 static void adjust_audio_input_rate(void)
 {
-   static bool first = true;
-   if (!first)
-      return;
-
    if (g_extern.system.timing_set)
    {
       float timing_skew = fabs(1.0f - g_extern.system.timing.fps / g_settings.video.refresh_rate);
@@ -287,7 +283,6 @@ static void adjust_audio_input_rate(void)
    }
 
    SSNES_LOG("Set audio input rate to: %.2f Hz.\n", g_settings.audio.in_rate);
-   first = false;
 }
 
 void init_audio(void)

ssnes.c

@@ -609,6 +609,9 @@ static void parse_input(int argc, char *argv[])
       ssnes_fail(1, "parse_input()");
    }
 
+   // Make sure we can call parse_input several times ...
+   optind = 1;
+
    int val = 0;
 
    const struct option opts[] = {