Unify plugin descriptions

fb2k/in_vgmstream.cpp

@@ -1,9 +1,6 @@
-/* Winamp plugin interface for vgmstream */
+/**
-/* Based on: */
+ * vgmstream for foobar2000
-/*
+ */
-** Example Winamp .RAW input plug-in
-** Copyright (c) 1998, Justin Frankel/Nullsoft Inc.
-*/
 
 #ifdef _MSC_VER
 #define _CRT_SECURE_NO_DEPRECATE
@@ -35,10 +32,12 @@ extern "C" {
 
 #define APP_NAME "vgmstream plugin"
 #define PLUGIN_DESCRIPTION "vgmstream plugin " VERSION " " __DATE__ "\n" \
-            "by hcs, FastElbja, manakoAT, bxaimc and bnnm\n" \
+            "by hcs, FastElbja, manakoAT, bxaimc, snakemeat, soneek, kode54, bnnm and many others\n" \
-            "foobar2000 plugin by Josh W, kode54\n\n" \
+            "\n" \
-	    "https://github.com/kode54/vgmstream\n\n" \
+            "foobar2000 plugin by Josh W, kode54\n" \
-            "http://sourceforge.net/projects/vgmstream"
+            "\n" \
+            "https://github.com/kode54/vgmstream/\n" \
+            "https://sourceforge.net/projects/vgmstream/ (original)";
 
 
 

unix/plugin.cc

@@ -47,13 +47,16 @@ const char *const VgmstreamPlugin::defaults[] = {
 };
 
 const char VgmstreamPlugin::about[] =
-    "vgmstream for Audacious version: " VERSION "\n"
+    "vgmstream plugin " VERSION " " __DATE__ "\n"
+    "by hcs, FastElbja, manakoAT, bxaimc, snakemeat, soneek, kode54, bnnm and many others\n"
     "\n"
+    "Audacious plugin:\n"
     "ported to Audacious 3.6 by Brandon Whitehead\n"
     "adopted from Audacious 3 port by Thomas Eppers\n"
     "originally written by Todd Jeffreys (http://voidpointer.org/)\n"
-    "vgmstream written by hcs, FastElbja, manakoAT, and bxaimc\n"
+    "\n"
-    "http://www.sf.net/projects/vgmstream";
+    "https://github.com/kode54/vgmstream/\n"
+    "https://sourceforge.net/projects/vgmstream/ (original)";
 
 const PreferencesWidget VgmstreamPlugin::widgets[] = {
     WidgetLabel(N_("<b>vgmstream Config</b>")),

winamp/in_vgmstream.c

@@ -1,15 +1,11 @@
-/* Winamp plugin interface for vgmstream */
+/**
-/* Based on: */
+ * vgmstream for Winamp
-/*
+ */
-** Example Winamp .RAW input plug-in
-** Copyright (c) 1998, Justin Frankel/Nullsoft Inc.
-*/
 
 /* Winamp uses wchar_t filenames when this is on, so extra steps are needed.
  * To open unicode filenames it needs to use _wfopen, inside a WA_STREAMFILE to pass around */
 //#define UNICODE_INPUT_PLUGIN
 
-
 #ifdef _MSC_VER
 #define _CRT_SECURE_NO_DEPRECATE
 #endif
@@ -200,8 +196,12 @@ static void copy_title(in_char * dst, int dst_size, const in_char * src) {
 void about(HWND hwndParent) {
     MessageBox(hwndParent,
             PLUGIN_DESCRIPTION "\n"
-            "by hcs, FastElbja, manakoAT, bxaimc, and snakemeat\n\n"
+            "by hcs, FastElbja, manakoAT, bxaimc, snakemeat, soneek, kode54, bnnm and many others\n"
-            "http://sourceforge.net/projects/vgmstream"
+            "\n"
+            "Winamp plugin by hcs, others\n"
+            "\n"
+            "https://github.com/kode54/vgmstream/\n"
+            "https://sourceforge.net/projects/vgmstream/ (original)"
             ,"about in_vgmstream",MB_OK);
 }
 

xmp-vgmstream/DllMain.c

@@ -15,6 +15,7 @@
 #include "../src/vgmstream.h"
 #include "xmpin.h"
 
+
 #ifndef VERSION
 #include "../version.h"
 #endif
@@ -26,6 +27,8 @@ static XMPFUNC_IN *xmpfin;
 static XMPFUNC_MISC *xmpfmisc;
 static XMPFUNC_FILE *xmpffile;
 
+/* ************************************* */
+
 typedef struct _XMPSTREAMFILE {
 	STREAMFILE sf;
 	XMPFILE file;
@@ -69,8 +72,11 @@ static size_t xmpsf_read(XMPSTREAMFILE *this, uint8_t *dest, off_t offset, size_
 
 static void xmpsf_close(XMPSTREAMFILE *this)
 {
-// The line below is what Causes this Plugin to Crash. Credits to Ian Luck to Finding this issue.
+    // The line below is what Causes this Plugin to Crash. Credits to Ian Luck to Finding this issue.
-//	xmpffile->Close(this->file); 
+    // This closes the internal XMPFILE, which must be done by XMPlay instead.
+    // However vgmtream sometimes opens its own files, so it may be leaking handles.
+    //xmpffile->Close(this->file);
+
 	free(this);
 }
 
@@ -148,17 +154,23 @@ err1:
 	return NULL;
 }
 
+/* ************************************* */
+
+/* internal state */
 VGMSTREAM * vgmstream = NULL;
 int32_t totalFrames, framesDone, framesLength, framesFade;
 
-#define APP_NAME "vgmstream plugin"
+#define APP_NAME "vgmstream plugin" //unused?
-#define PLUGIN_DESCRIPTION "vgmstream plugin " VERSION " " __DATE__
 
 void __stdcall XMP_About(HWND hwParent) {
     MessageBox(hwParent,
-            PLUGIN_DESCRIPTION "\n"
+            "vgmstream plugin " VERSION " " __DATE__ "\n"
-            "by hcs, FastElbja, manakoAT, bxaimc, kode54, and PSXGamerPro1\n\n"
+            "by hcs, FastElbja, manakoAT, bxaimc, snakemeat, soneek, kode54, bnnm and many others\n"
-			"https://gitlab.kode54.net/kode54/vgmstream"
+            "\n"
+            "XMPlay plugin by unknownfile, PSXGamerPro1, kode54\n"
+            "\n"
+            "https://github.com/kode54/vgmstream/\n"
+            "https://sourceforge.net/projects/vgmstream/ (original)"
             ,"about xmp-vgmstream",MB_OK);
 }