Use new FOURCC macro (dfxplugin-prefix.h) instead of multi-character …

…character constants. These give a warning on my system and are probably a bad idea since they are implementation-defined (byte order in particular). While I'm touching these files, avoid __ in #defines; it's technically reserved for system use. Fixed some cases where (probably abandoned) plugins had not updated their ids. Minor updates to transverb win32 makefile.
sophiapoirier · Jun 29, 2020 · f8336e5 · f8336e5
1 parent e2bda91
commit f8336e5
Show file tree

Hide file tree

Showing 44 changed files with 128 additions and 97 deletions.
diff --git a/brokenfft/brokenfft.h b/brokenfft/brokenfft.h
@@ -1,8 +1,8 @@
 
 /* BrokenFFT 2, featuring the Super Destroy FX Windowing System! */
 
-#ifndef __DFX_BROKENFFT_H
-#define __DFX_BROKENFFT_H
+#ifndef _DFX_BROKENFFT_H
+#define _DFX_BROKENFFT_H
 
 #include <audioeffectx.h>
 #include "rfftw.h"
@@ -18,9 +18,12 @@
 
 #define MAXECHO 8192
 
+#define FOURCC(a, b, c, d) (((unsigned int)(a) << 24) | ((unsigned int)(b) << 16) | \
+ ((unsigned int)(c) << 8) | ((unsigned int)(d)))
+
 /* change these for your plugins */
 #define PLUGIN BrokenFFT
-#define PLUGINID 'DFbf'
+#define PLUGINID FOURCC('D', 'F', 'b', 'f')
 #define PLUGINNAME "DFX BROKENFFT"
 #define PLUGINPROGRAM BrokenFFTProgram
 

diff --git a/brokenfft/oldfft.h b/brokenfft/oldfft.h
@@ -1,9 +1,9 @@
 
 
-/* broken fft: $Id: oldfft.h,v 1.1 2002-03-25 03:14:12 tom7 Exp $ */
+/* broken fft: $Id: oldfft.h,v 1.02 2020/06/29 00:45:26 tom7 Exp $ */
 
-#ifndef __AGAIN_H
-#define __AGAIN_H
+#ifndef _AGAIN_H
+#define _AGAIN_H
 
 #include <audioeffectx.h>
 

diff --git a/bufferoverride/bufferoverridedef.h b/bufferoverride/bufferoverridedef.h
@@ -27,7 +27,7 @@ To contact the author, use the contact form at http:https://destroyfx.org/
 
 
 #define PLUGIN_NAME_STRING "Buffer Override"
-#define PLUGIN_ID 'buff'
+#define PLUGIN_ID  FOURCC('b', 'u', 'f', 'f')
 #define PLUGIN_VERSION_MAJOR 2
 #define PLUGIN_VERSION_MINOR 1
 #define PLUGIN_VERSION_BUGFIX 0

diff --git a/decimate/decimate.h b/decimate/decimate.h
@@ -1,6 +1,6 @@
 
-#ifndef __DECIMATE_H
-#define __DECIMATE_H
+#ifndef _DFX_DECIMATE_H
+#define _DFX_DECIMATE_H
 
 #include "audioeffectx.h"
 

diff --git a/dfx-library/dfxdefines.h b/dfx-library/dfxdefines.h
@@ -25,8 +25,8 @@ These are our general global defines and constants, to be included
 somewhere in the include tree for every file for a DfxPlugin.
 ------------------------------------------------------------------------*/
 
-#ifndef __DFX_DEFINES_H
-#define __DFX_DEFINES_H
+#ifndef _DFX_DEFINES_H
+#define _DFX_DEFINES_H
 
 
 

diff --git a/dfx-library/dfxplugin-audiosuite.h b/dfx-library/dfxplugin-audiosuite.h
@@ -25,8 +25,8 @@ This is our class for E-Z plugin-making and E-Z multiple-API support.
 This is where we connect the AudioSuite API to our DfxPlugin system.
 ------------------------------------------------------------------------*/
 
-#ifndef __DFXPLUGIN_AUDIOSUITE_H
-#define __DFXPLUGIN_AUDIOSUITE_H
+#ifndef _DFXPLUGIN_AUDIOSUITE_H
+#define _DFXPLUGIN_AUDIOSUITE_H
 
 
 /* XXX this file is a hack for AudioSuite support with a separate class hierarchy */

diff --git a/dfx-library/dfxplugin-prefix.h b/dfx-library/dfxplugin-prefix.h
@@ -24,9 +24,18 @@ Destroy FX is a sovereign entity comprised of Sophia Poirier and Tom Murphy 7.
 This file should be included by any prefix header that you use for your plugin.
 ------------------------------------------------------------------------*/
 
-#ifndef __DFXPLUGIN_PREFIX_H
-#define __DFXPLUGIN_PREFIX_H
+#ifndef _DFXPLUGIN_PREFIX_H
+#define _DFXPLUGIN_PREFIX_H
 
+/*-----------------------------------------------------------------------------*/
+/* General stuff */
+
+/* Give a plugin ID using character constants, like
+ FOURCC('D', 'F', 'x', 'p')
+ The result always in big-endian order (FOURCC(1, 2, 3, 4) == 0x01020304).
+*/
+#define FOURCC(a, b, c, d) (((unsigned int)(a) << 24) | ((unsigned int)(b) << 16) | \
+ ((unsigned int)(c) << 8) | ((unsigned int)(d)))
 
 /*-----------------------------------------------------------------------------*/
 /* Mac stuff */

diff --git a/dfx-library/dfxplugindef-template.h b/dfx-library/dfxplugindef-template.h
@@ -22,20 +22,22 @@ To contact the author, use the contact form at http:https://destroyfx.org/
 ------------------------------------------------------------------------*/
 
 
-#ifndef __DFXPLUGIN_DEF_TEMPLATE_H
-#define __DFXPLUGIN_DEF_TEMPLATE_H
+#ifndef _DFXPLUGIN_DEF_TEMPLATE_H
+#define _DFXPLUGIN_DEF_TEMPLATE_H
 
 
 #include "dfxplugin-prefix.h"
 
 
 // required
 #define PLUGIN_NAME_STRING ""
-#define PLUGIN_ID ''
-#define PLUGIN_VERSION_MAJOR 
-#define PLUGIN_VERSION_MINOR 
-#define PLUGIN_VERSION_BUGFIX 
-#define PLUGIN_VERSION_STRING 
+// should be unique among all plugins (!) Official Destroy FX plugins use 'D' 'F'
+// for the first two characters
+#define PLUGIN_ID FOURCC('A', 'B', 'C', 'D')
+#define PLUGIN_VERSION_MAJOR 1
+#define PLUGIN_VERSION_MINOR 0
+#define PLUGIN_VERSION_BUGFIX 0
+#define PLUGIN_VERSION_STRING "1.0.0"
 #define PLUGIN_CLASS_NAME 
 #define PLUGIN_ENTRY_POINT "Entry"
 #define PLUGIN_BUNDLE_IDENTIFIER DESTROYFX_BUNDLE_ID_PREFIX "" DFX_BUNDLE_ID_SUFFIX

diff --git a/dfx-library/keys.h b/dfx-library/keys.h
@@ -1,6 +1,6 @@
 
-#ifndef __KEYS_H
-#define __KEYS_H
+#ifndef _KEYS_H
+#define _KEYS_H
 
 /* These are keys for the abstract GUI layer. */
 

diff --git a/eqsync/eqsyncdef.h b/eqsync/eqsyncdef.h
@@ -27,7 +27,7 @@ To contact the author, use the contact form at http:https://destroyfx.org/
 
 
 #define PLUGIN_NAME_STRING "EQ Sync"
-#define PLUGIN_ID 'EQsy'
+#define PLUGIN_ID  FOURCC('E', 'Q', 's', 'y')
 #define PLUGIN_VERSION_MAJOR 1
 #define PLUGIN_VERSION_MINOR 1
 #define PLUGIN_VERSION_BUGFIX 0

diff --git a/exemplar/exemplar.cpp b/exemplar/exemplar.cpp
@@ -15,7 +15,7 @@
 #define STRIDE 128
 
 #if defined(TARGET_API_VST) && TARGET_PLUGIN_HAS_GUI
- #ifndef __DFX_EXEMPLAREDITOR_H
+ #ifndef _DFX_EXEMPLAREDITOR_H
  #include "exemplareditor.hpp"
  #endif
 #endif

diff --git a/exemplar/exemplar.h b/exemplar/exemplar.h
@@ -1,8 +1,8 @@
 
 /* Windowingstub, starring the Super Destroy FX Windowing System! */
 
-#ifndef __DFX_EXEMPLAR_H
-#define __DFX_EXEMPLAR_H
+#ifndef _DFX_EXEMPLAR_H
+#define _DFX_EXEMPLAR_H
 
 #include <dfxplugin.h>
 #include "ANN/ANN.h"

diff --git a/exemplar/exemplardefs.h b/exemplar/exemplardefs.h
@@ -3,7 +3,7 @@
  see dfxplugin.h for details. */
 
 #define PLUGIN_NAME_STRING "DFX EXEMPLAR"
-#define PLUGIN_ID 'DFex'
+#define PLUGIN_ID  FOURCC('D', 'F', 'e', 'x')
 #define PLUGIN_VERSION 0x00010100
 #define PLUGIN_ENTRY_POINT "ExemplarEntry"
 

diff --git a/firefly/GUI/fireflyeditor.hpp b/firefly/GUI/fireflyeditor.hpp
@@ -1,6 +1,6 @@
 
-#ifndef __DFX_FIREFLYEDITOR_H
-#define __DFX_FIREFLYEDITOR_H
+#ifndef _DFX_FIREFLYEDITOR_H
+#define _DFX_FIREFLYEDITOR_H
 
 #include "dfxgui.h"
 #include "multikick.hpp"

diff --git a/firefly/firefly.hpp b/firefly/firefly.hpp
@@ -1,8 +1,8 @@
 
 /* DFX Firefly : Universal FIR filter; EXTREME style. */
 
-#ifndef __DFX_FIREFLY_H
-#define __DFX_FIREFLY_H
+#ifndef _DFX_FIREFLY_H
+#define _DFX_FIREFLY_H
 
 #include <audioeffectx.h>
 
@@ -18,9 +18,12 @@
 #define fsign(f) ((f<0.0)?-1.0:1.0)
 #define pi (3.1415926535)
 
+#define FOURCC(a, b, c, d) (((unsigned int)(a) << 24) | ((unsigned int)(b) << 16) | \
+ ((unsigned int)(c) << 8) | ((unsigned int)(d)))
+
 /* change these for your plugins */
 #define PLUGIN FireFly
-#define PLUGINID 'DFff'
+#define PLUGINID FOURCC('D', 'F', 'f', 'f')
 #define PLUGINNAME "DFX Firefly"
 #define DEFPROGRAMNAME "Lampyridae"
 #define PLUGINPROGRAM FireFlyProgram

diff --git a/geometer/geometerdef.h b/geometer/geometerdef.h
@@ -1,5 +1,5 @@
 /*------------------------------------------------------------------------
-Copyright (C) 2002-2018 Tom Murphy 7 and Sophia Poirier
+Copyright (C) 2002-2020 Tom Murphy 7 and Sophia Poirier
 
 This file is part of Geometer.
 
@@ -27,7 +27,7 @@ To contact the author, use the contact form at http:https://destroyfx.org/
 
 
 #define PLUGIN_NAME_STRING "Geometer"
-#define PLUGIN_ID 'DFgr'
+#define PLUGIN_ID  FOURCC('D', 'F', 'g', 'r')
 #define PLUGIN_VERSION_MAJOR 1
 #define PLUGIN_VERSION_MINOR 2
 #define PLUGIN_VERSION_BUGFIX 0
@@ -41,7 +41,7 @@ To contact the author, use the contact form at http:https://destroyfx.org/
 #define PLUGIN_BACKGROUND_IMAGE_FILENAME "geometer-background.png"
 //#define PLUGIN_BACKGROUND_IMAGE_FILENAME "geometer-background-short.png"
 #define PLUGIN_BUNDLE_IDENTIFIER DESTROYFX_BUNDLE_ID_PREFIX PLUGIN_NAME_STRING DFX_BUNDLE_ID_SUFFIX
-#define PLUGIN_COPYRIGHT_YEAR_STRING "2002-2018"
+#define PLUGIN_COPYRIGHT_YEAR_STRING "2002-2020"
 
 // optional
 #define PLUGIN_DESCRIPTION_STRING "visually oriented waveform geometry"

diff --git a/guitest/guitest.h b/guitest/guitest.h
@@ -1,8 +1,8 @@
 
-/* Windowingstub, starring the Super Destroy FX Windowing System! */
+/* Guitest, starring the Super Destroy FX Windowing System! */
 
-#ifndef __DFX_WINDOWINGSTUB_H
-#define __DFX_WINDOWINGSTUB_H
+#ifndef _DFX_GUITEST_H
+#define _DFX_GUITEST_H
 
 #include "dfxplugin.h"
 

diff --git a/guitest/guitestdefs.h b/guitest/guitestdefs.h
@@ -2,10 +2,10 @@
 /* You need to redefine this stuff in order to make your plugin.
  see dfxplugin.h for details. */
 
-#define PLUGIN_NAME_STRING "WINDOWINGSTUB"
-#define PLUGIN_ID 'DFws'
+#define PLUGIN_NAME_STRING "GUITEST"
+#define PLUGIN_ID FOURCC('D', 'F', 'g', 't')
 #define PLUGIN_VERSION 0x00010100
-#define PLUGIN_ENTRY_POINT "WindowingstubEntry"
+#define PLUGIN_ENTRY_POINT "GuitestEntry"
 
 #define TARGET_PLUGIN_USES_MIDI 1
 #define TARGET_PLUGIN_IS_INSTRUMENT 0
@@ -16,7 +16,7 @@
 #endif
 
 /* only necessary if using a custom GUI */
-#define PLUGIN_EDITOR_ENTRY_POINT "WindowingstubEditorEntry"
+#define PLUGIN_EDITOR_ENTRY_POINT "GuitestEditorEntry"
 
 // optional
 #define PLUGIN_DESCRIPTION_STRING "i forgot to change the description"

diff --git a/guitest/guitesteditor.h b/guitest/guitesteditor.h
@@ -1,6 +1,6 @@
 
-#ifndef __DFX_GUITESTEDITOR_H
-#define __DFX_GUITESTEDITOR_H
+#ifndef _DFX_GUITESTEDITOR_H
+#define _DFX_GUITESTEDITOR_H
 
 #include <audioeffectx.h>
 #include <aeffeditor.hpp>

diff --git a/intercom/intercom.h b/intercom/intercom.h
@@ -5,8 +5,8 @@
 
 ---------------------------------------------------------------*/
 
-#ifndef __DFX_INTERCOM_H
-#define __DFX_INTERCOM_H
+#ifndef _DFX_INTERCOM_H
+#define _DFX_INTERCOM_H
 
 #include "audioeffectx.h"
 

diff --git a/midigater/midigaterdef.h b/midigater/midigaterdef.h
@@ -27,7 +27,7 @@ To contact the author, use the contact form at http:https://destroyfx.org/
 
 
 #define PLUGIN_NAME_STRING "MIDI Gater"
-#define PLUGIN_ID 'Mgat'
+#define PLUGIN_ID  FOURCC('M', 'g', 'a', 't')
 #define PLUGIN_VERSION_MAJOR 1
 #define PLUGIN_VERSION_MINOR 1
 #define PLUGIN_VERSION_BUGFIX 0

diff --git a/monomaker/monomakerdef.h b/monomaker/monomakerdef.h
@@ -27,7 +27,7 @@ To contact the author, use the contact form at http:https://destroyfx.org/
 
 
 #define PLUGIN_NAME_STRING "Monomaker"
-#define PLUGIN_ID 'mono'
+#define PLUGIN_ID  FOURCC('m', 'o', 'n', 'o')
 #define PLUGIN_VERSION_MAJOR 1
 #define PLUGIN_VERSION_MINOR 1
 #define PLUGIN_VERSION_BUGFIX 0

diff --git a/polarizer/polarizerdef.h b/polarizer/polarizerdef.h
@@ -27,7 +27,7 @@ To contact the author, use the contact form at http:https://destroyfx.org/
 
 
 #define PLUGIN_NAME_STRING "Polarizer"
-#define PLUGIN_ID 'pola'
+#define PLUGIN_ID FOURCC('p', 'o', 'l', 'a')
 #define PLUGIN_VERSION_MAJOR 1
 #define PLUGIN_VERSION_MINOR 1
 #define PLUGIN_VERSION_BUGFIX 0

diff --git a/rezsynth/rezsynthdef.h b/rezsynth/rezsynthdef.h
@@ -27,7 +27,7 @@ To contact the author, use the contact form at http:https://destroyfx.org/
 
 
 #define PLUGIN_NAME_STRING "Rez Synth"
-#define PLUGIN_ID 'RezS'
+#define PLUGIN_ID  FOURCC('R', 'e', 'z', 'S')
 #define PLUGIN_VERSION_MAJOR 2
 #define PLUGIN_VERSION_MINOR 0
 #define PLUGIN_VERSION_BUGFIX 0

diff --git a/rmsbuddy/rmsbuddy-vst.h b/rmsbuddy/rmsbuddy-vst.h
@@ -1,7 +1,7 @@
 /*----------------------- by Sophia Poirier ][ June 2001 ----------------------*/
 
-#ifndef __RMSBUDDY_VST_H
-#define __RMSBUDDY_VST_H
+#ifndef _DFX_RMSBUDDY_VST_H
+#define _DFX_RMSBUDDY_VST_H
 
 #include "audioeffectx.h"
 

diff --git a/rmsbuddy/rmsbuddydef.h b/rmsbuddy/rmsbuddydef.h
@@ -1,9 +1,9 @@
-#ifndef __RMSBUDDY_DEF_H
-#define __RMSBUDDY_DEF_H
+#ifndef _RMSBUDDY_DEF_H
+#define _RMSBUDDY_DEF_H
 
 #define RMS_BUDDY_VERSION 0x00010105
-#define RMS_BUDDY_PLUGIN_ID 'rbud'
-#define RMS_BUDDY_MANUFACTURER_ID 'DFX!'
+#define RMS_BUDDY_PLUGIN_ID FOURCC('r', 'b', 'u', 'd')
+#define RMS_BUDDY_MANUFACTURER_ID FOURCC('D', 'F', 'X', '!')
 #define RMS_BUDDY_BUNDLE_ID "org.destroyfx.RMSBuddy"
 
 #endif
diff --git a/rmsbuddy/rmsbuddyeditor-vst.h b/rmsbuddy/rmsbuddyeditor-vst.h
@@ -1,7 +1,7 @@
 /*----------------------- by Sophia Poirier ][ June 2001 ----------------------*/
 
-#ifndef __RMSBUDDYEDITOR_VST_H
-#define __RMSBUDDYEDITOR_VST_H
+#ifndef _DFX_RMSBUDDYEDITOR_VST_H
+#define _DFX_RMSBUDDYEDITOR_VST_H
 
 #include "vstgui.h"
 
@@ -20,7 +20,7 @@ class RMSbuddyEditor : public AEffGUIEditor, public CControlListener
 
  virtual void valueChanged(CDrawContext* context, CControl* control);
 
- virtual void idle();
+ virtual void idle();
 
 private:
  // controls

diff --git a/rmsbuddy/rmsbuddyeditor.h b/rmsbuddy/rmsbuddyeditor.h
@@ -19,8 +19,8 @@ along with RMS Buddy. If not, see <http:https://www.gnu.org/licenses/>.
 To contact the author, use the contact form at http:https://destroyfx.org/
 ------------------------------------------------------------------------*/
 
-#ifndef __RMS_BUDDY_EDITOR_H
-#define __RMS_BUDDY_EDITOR_H
+#ifndef _DFX_RMS_BUDDY_EDITOR_H
+#define _DFX_RMS_BUDDY_EDITOR_H
 
 
 #include "AUCarbonViewBase.h"

diff --git a/scrubby/gui/scrubbykeyboard.h b/scrubby/gui/scrubbykeyboard.h
@@ -3,8 +3,8 @@
 // by Sophia Poirier, May 2002
 //=============================================================================
 
-#ifndef __scrubbykeyboard
-#define __scrubbykeyboard
+#ifndef _DFX_SCRUBBYKEYBOARD
+#define _DFX_SCRUBBYKEYBOARD
 
 #include "dfxguimulticontrols.h"
 
@@ -50,4 +50,4 @@ class ScrubbyKeyboard : public CMultiControl
 };
 
 
-#endif
+#endif