The proposal about a SDL port

[tttttttttanaka]

Hi,

 

there is a point which is individually worrisome about a SDL port.

 

 

Please change into the configuration file name different from original VisualBoyAdvance (For example, vbam.cfg). It is not compatible with original VisualBoyAdvance.cfg.

 

Code: Select all

--- trunk/CMakeLists.txt.orig
+++ trunk/CMakeLists.txt
@@ -242,7 +242,7 @@
    INSTALL(PROGRAMS vbam DESTINATION bin)
    INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/sdl/VisualBoyAdvance.cfg-example
            DESTINATION ${SYSCONFDIR}
-            RENAME VisualBoyAdvance.cfg)
+            RENAME vbam.cfg)

ENDIF( CAN_BUILD_VBAM )

--- trunk/src/sdl/SDL.cpp.orig
+++ trunk/src/sdl/SDL.cpp
@@ -841,7 +841,7 @@

void sdlReadPreferences()
{
-  FILE *f = sdlFindFile("VisualBoyAdvance.cfg");
+  FILE *f = sdlFindFile("vbam.cfg");

  if(f == NULL) {
    fprintf(stderr, "Configuration file NOT FOUND (using defaults)\n");

 

 

Please do not carry out the error output of what is not an error message.

 

Code: Select all

--- trunk/src/sdl/SDL.cpp.orig
+++ trunk/src/sdl/SDL.cpp
@@ -436,10 +436,10 @@
#define EXE_NAME "vbam"
#endif // ! _WIN32

-  fprintf(stderr, "Searching for file %s\n", name);
+  fprintf(stdout, "Searching for file %s\n", name);

  if(GETCWD(buffer, 2048)) {
-    fprintf(stderr, "Searching current directory: %s\n", buffer);
+    fprintf(stdout, "Searching current directory: %s\n", buffer);
  }

  FILE *f = fopen(name, "r");
@@ -448,7 +448,7 @@
  }

  if(homeDir) {
-    fprintf(stderr, "Searching home directory: %s%c%s\n", homeDir, FILE_SEP, DOT_DIR);
+    fprintf(stdout, "Searching home directory: %s%c%s\n", homeDir, FILE_SEP, DOT_DIR);
    sprintf(path, "%s%c%s%c%s", homeDir, FILE_SEP, DOT_DIR, FILE_SEP, name);
    f = fopen(path, "r");
    if(f != NULL)
@@ -458,14 +458,14 @@
#ifdef _WIN32
  char *home = getenv("USERPROFILE");
  if(home != NULL) {
-    fprintf(stderr, "Searching user profile directory: %s\n", home);
+    fprintf(stdout, "Searching user profile directory: %s\n", home);
    sprintf(path, "%s%c%s", home, FILE_SEP, name);
    f = fopen(path, "r");
    if(f != NULL)
      return f;
  }
#else // ! _WIN32
-  fprintf(stderr, "Searching system config directory: %s\n", SYSCONFDIR);
+  fprintf(stdout, "Searching system config directory: %s\n", SYSCONFDIR);
  sprintf(path, "%s%c%s", SYSCONFDIR, FILE_SEP, name);
  f = fopen(path, "r");
  if(f != NULL)
@@ -477,7 +477,7 @@
    char *path = getenv("PATH");

    if(path != NULL) {
-      fprintf(stderr, "Searching PATH\n");
+      fprintf(stdout, "Searching PATH\n");
      strncpy(buffer, path, 4096);
      buffer[4095] = 0;
      char *tok = strtok(buffer, PATH_SEP);
@@ -491,7 +491,7 @@
          sprintf(path2, "%s%c%s", tok, FILE_SEP, name);
          f = fopen(path2, "r");
          if(f != NULL) {
-            fprintf(stderr, "Found at %s\n", path2);
+            fprintf(stdout, "Found at %s\n", path2);
            return f;
          }
        }
@@ -500,7 +500,7 @@
    }
  } else {
    // executable is relative to some directory
-    fprintf(stderr, "Searching executable directory\n");
+    fprintf(stdout, "Searching executable directory\n");
    strcpy(buffer, arg0);
    char *p = strrchr(buffer, FILE_SEP);
    if(p) {
@@ -541,7 +541,7 @@
    char *value = strtok(NULL, "\t\n\r");

    if(value == NULL) {
-      fprintf(stderr, "Empty value for key %s\n", key);
+      fprintf(stdout, "Empty value for key %s\n", key);
      continue;
    }

@@ -841,10 +841,10 @@
  FILE *f = sdlFindFile("vbam.cfg");

  if(f == NULL) {
-    fprintf(stderr, "Configuration file NOT FOUND (using defaults)\n");
+    fprintf(stdout, "Configuration file NOT FOUND (using defaults)\n");
    return;
  } else
-    fprintf(stderr, "Reading configuration file.\n");
+    fprintf(stdout, "Reading configuration file.\n");

  sdlReadPreferences(f);

@@ -855,10 +855,10 @@
{
  FILE *f = sdlFindFile("vba-over.ini");
  if(!f) {
-    fprintf(stderr, "vba-over.ini NOT FOUND (using emulator settings)\n");
+    fprintf(stdout, "vba-over.ini NOT FOUND (using emulator settings)\n");
    return;

  } else
-    fprintf(stderr, "Reading vba-over.ini\n");
+    fprintf(stdout, "Reading vba-over.ini\n");

  char buffer[7];

  buffer[0] = '[';
@@ -1043,19 +1043,19 @@
  /* on POSIX, rename would not do anything anyway for identical names, but let's check it ourselves anyway */
  if (to != backup) {
	  if (-1 == rename(stateNameDest, stateNameBack)) {
-		fprintf(stderr, "savestate backup: can't backup old state %s to %s", stateNameDest, stateNameBack );
+		fprintf(stdout, "savestate backup: can't backup old state %s to %s", stateNameDest, stateNameBack );
		perror(": ");
	  }
  }
  if (to != from) {
	  if (-1 == rename(stateNameOrig, stateNameDest)) {
-		fprintf(stderr, "savestate backup: can't move new state %s to %s", stateNameOrig, stateNameDest );
+		fprintf(stdout, "savestate backup: can't move new state %s to %s", stateNameOrig, stateNameDest );
		perror(": ");
	  }
  }

  systemConsoleMessage("Savestate store and backup committed"); // with timestamp and newline
-  fprintf(stderr, "to slot %d, backup in %d, using temporary slot %d\n", to+1, backup+1, from+1);
+  fprintf(stdout, "to slot %d, backup in %d, using temporary slot %d\n", to+1, backup+1, from+1);
}

void sdlWriteBattery()
@@ -1232,7 +1232,7 @@
				if (saveSlotPosition > 0)
				{
					saveSlotPosition--;
-					fprintf(stderr, "Changed savestate slot to %d.\n", saveSlotPosition + 1);
+					fprintf(stdout, "Changed savestate slot to %d.\n", saveSlotPosition + 1);
				} else
					fprintf(stderr, "Can't decrease slotnumber below 1.\n");
				return; // handled
@@ -1240,7 +1240,7 @@
				if (saveSlotPosition < 7)
				{
					saveSlotPosition++;
-					fprintf(stderr, "Changed savestate slot to %d.\n", saveSlotPosition + 1);
+					fprintf(stdout, "Changed savestate slot to %d.\n", saveSlotPosition + 1);
				} else
					fprintf(stderr, "Can't increase slotnumber above 8.\n");
				return; // handled
@@ -1780,7 +1780,7 @@

int main(int argc, char **argv)
{
-  fprintf(stderr, "VBA-M version %s [sDL]\n", VERSION);
+  fprintf(stdout, "VBA-M version %s [sDL]\n", VERSION);

  arg0 = argv[0];

@@ -2080,7 +2080,7 @@
          int size = gbRomSize, patchnum;
//          utilApplyIPS(ipsname, &gbRom, &size);
          for (patchnum = 0; patchnum < sdl_ips_num; patchnum++) {
-            fprintf(stderr, "Trying IPS patch %s.\n", sdl_ips_names[patchnum]);
+            fprintf(stdout, "Trying IPS patch %s.\n", sdl_ips_names[patchnum]);
            utilApplyIPS(sdl_ips_names[patchnum], &gbRom, &size);
	  }
          if(size != gbRomSize) {
@@ -2107,7 +2107,7 @@
          int size = 0x2000000, patchnum;
//          utilApplyIPS(ipsname, &rom, &size);
          for (patchnum = 0; patchnum < sdl_ips_num; patchnum++) {
-            fprintf(stderr, "Trying IPS patch %s.\n", sdl_ips_names[patchnum]);
+            fprintf(stdout, "Trying IPS patch %s.\n", sdl_ips_names[patchnum]);
            utilApplyIPS(sdl_ips_names[patchnum], &rom, &size);
	  }
          if(size != 0x2000000) {
@@ -2205,7 +2205,7 @@
    exit(-1);
  }

-  fprintf(stderr,"Color depth: %d\n", systemColorDepth);
+  fprintf(stdout,"Color depth: %d\n", systemColorDepth);

  utilUpdateSystemColorMaps();

@@ -2234,10 +2234,10 @@
		p	= sdlPreparedCheatCodes[i];
		l	= strlen(p);
		if (l == 17 && p[8] == ':') {
-			fprintf(stderr,"Adding cheat code %s\n", p);
+			fprintf(stdout,"Adding cheat code %s\n", p);
			cheatsAddCheatCode(p, p);
		} else if (l == 13 && p[8] == ' ') {
-			fprintf(stderr,"Adding CBA cheat code %s\n", p);
+			fprintf(stdout,"Adding CBA cheat code %s\n", p);
			cheatsAddCBACode(p, p);
		} else if (l == 8) {
			fprintf(stderr,"Adding GB(GS) cheat code %s\n", p);
@@ -2276,7 +2276,7 @@
  }

  emulating = 0;
-  fprintf(stderr,"Shutting down\n");
+  fprintf(stdout,"Shutting down\n");
  remoteCleanUp();
  soundShutdown();

@@ -2546,7 +2546,7 @@
  now_time		= time(NULL);
  now_time_broken	= *(localtime( &now_time ));
  fprintf(
-		stderr,
+		stdout,
		"%02d:%02d:%02d %02d.%02d.%4d: %s\n",
		now_time_broken.tm_hour,
		now_time_broken.tm_min,

[bgK]

Thanks for your changes. This is indeed more correct this way, commited to SVN.

If you want to submit some more patches, please attach them as files. Copying and pasting broke the patches and I had to apply the changes manually.

[tttttttttanaka]

Thank you, it understood about the presentation method of the patch. It supplements.

 

Code: Select all

--- trunk/src/sdl/SDL.cpp
+++ trunk/src/sdl/SDL.cpp
@@ -310,27 +310,27 @@

void StartLirc(void)
{
-  fprintf(stderr, "Trying to start LIRC: ");
+  fprintf(stdout, "Trying to start LIRC: ");
  //init LIRC and Record output
  LIRCfd = lirc_init( "vbam",1 );
  if( LIRCfd == -1 ) {
    //it failed
-    fprintf(stderr, "Failed\n");
+    fprintf(stdout, "Failed\n");
  } else {
-    fprintf(stderr, "Success\n");
+    fprintf(stdout, "Success\n");
    //read the config file
    char LIRCConfigLoc[2048];
    sprintf(LIRCConfigLoc, "%s/%s/%s", homeDir, DOT_DIR, "lircrc");
-    fprintf(stderr, "LIRC Config file:");
+    fprintf(stdout, "LIRC Config file:");
    if( lirc_readconfig(LIRCConfigLoc,&LIRCConfigInfo,NULL) == 0 ) {
      //check vbam dir for lircrc
-      fprintf(stderr, "Loaded (%s)\n", LIRCConfigLoc );
+      fprintf(stdout, "Loaded (%s)\n", LIRCConfigLoc );
    } else if( lirc_readconfig(NULL,&LIRCConfigInfo,NULL) == 0 ) {
      //check default lircrc location
-      fprintf(stderr, "Loaded\n");
+      fprintf(stdout, "Loaded\n");
    } else {
      //it all failed
-      fprintf(stderr, "Failed\n");
+      fprintf(stdout, "Failed\n");
      LIRCEnabled = false;
    }
    LIRCEnabled = true;
@@ -342,7 +342,7 @@
  //did we actually get lirc working at the start
  if(LIRCEnabled) {
    //if so free the config and deinit lirc
-    fprintf(stderr, "Shuting down LIRC\n");
+    fprintf(stdout, "Shuting down LIRC\n");
    lirc_freeconfig(LIRCConfigInfo);
    lirc_deinit();
    //set lirc enabled to false
@@ -2323,7 +2323,7 @@
  va_start(valist, msg);
  vsprintf(buffer, msg, valist);

-  fprintf(stdout, "%s\n", buffer);
+  fprintf(stderr, "%s\n", buffer);
  va_end(valist);
}

[bgK]

Ok, it's much easier this way. Commited.