ecsv avatar ecsv committed 449c9c5

Rename all visible Glide64 strings to Glide64mk2
The glide64 plugin for mupen64plus is available at the same time as the
glide64mk2 video plugin. Both support different features and use different
configuration options. A clear distinction is necessary to avoid confusion by
the users.

Comments (0)

Files changed (6)

projects/unix/Makefile

 #/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-# *   Mupen64plus-video-glide64 - Makefile                                  *
+# *   Mupen64plus-video-glide64mk2 - Makefile                               *
 # *   Mupen64Plus homepage: http://code.google.com/p/mupen64plus/           *
 # *   Copyright (C) 2010 Jon Ring                                           *
 # *   Copyright (C) 2007-2009 Richard Goedeken                              *

src/Glide64/Config.cpp

 BOOL Config_Open()
 {
     if (ConfigOpenSection("Video-General", &video_general_section) != M64ERR_SUCCESS ||
-        ConfigOpenSection("Video-Glide64", &video_glide64_section) != M64ERR_SUCCESS)
+        ConfigOpenSection("Video-Glide64mk2", &video_glide64_section) != M64ERR_SUCCESS)
     {
         ERRLOG("Could not open configuration");
         return FALSE;

src/Glide64/Main.cpp

         *APIVersion = VIDEO_PLUGIN_API_VERSION;
 
     if (PluginNamePtr != NULL)
-        *PluginNamePtr = "Glide64 Video Plugin";
+        *PluginNamePtr = "Glide64mk2 Video Plugin";
 
     if (Capabilities != NULL)
     {
   VLOG ("GetDllInfo ()\n");
   PluginInfo->Version = 0x0103;     // Set to 0x0103
   PluginInfo->Type  = PLUGIN_TYPE_GFX;  // Set to PLUGIN_TYPE_GFX
-  sprintf (PluginInfo->Name, "Glide64 "G64_VERSION RELTIME);  // Name of the DLL
+  sprintf (PluginInfo->Name, "Glide64mk2 "G64_VERSION RELTIME);  // Name of the DLL
 
   // If DLL supports memory these memory options then set them to TRUE or FALSE
   //  if it does not support it
     for (int i=1; ; i++)
     {
       path = capture_path;
-      path += wxT("Glide64_");
+      path += wxT("Glide64mk2_");
       path += romName;
       path += wxT("_");
       if (i < 10)
   LOG ("ReadScreen. Success.\n");
 }
 #endif
-#endif
+#endif

src/Glide64/m64p.h

 /******************************************************************************
  * Glide64 - Glide video plugin for Nintendo 64 emulators.
- * http://bitbucket.org/wahrhaft/mupen64plus-video-glide64/
+ * http://bitbucket.org/richard42/mupen64plus-video-glide64mk2/
  *
  * Copyright (C) 2010 Jon Ring
  *
 
 #endif
 
-#endif
+#endif

src/Glide64/rdp.cpp

     dc.DrawRectangle(0, 0, width, height);
 
     wxCoord w, h;
-    wxString text = wxT("Glide64");
+    wxString text = wxT("Glide64mk2");
     dc.GetTextExtent(text, &w, &h);
     wxCoord x = (width - w)/2;
     wxCoord y = height/2 - h*4;

src/Glitch64/main.cpp

 
   char caption[500];
 # ifdef _DEBUG
-  sprintf(caption, "Glide64 debug");
+  sprintf(caption, "Glide64mk2 debug");
 # else // _DEBUG
-  sprintf(caption, "Glide64");
+  sprintf(caption, "Glide64mk2");
 # endif // _DEBUG
   CoreVideo_SetCaption(caption);
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.