[OMPT-svn-commit] OpenMPT r22367 - in trunk/OpenMPT: mptrack soundlib soundlib/plugins

[<sv...@op...>]

Author: sagamusix
Date: Sat Nov 30 21:41:34 2024
New Revision: 22367
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22367

Log:
[Ref] Move PlugParamIndex and PlugParamValue definitions from PluginStructs.h to Snd_defs.h.

Modified:
   trunk/OpenMPT/mptrack/Childfrm.h
   trunk/OpenMPT/mptrack/MIDIMapping.h
   trunk/OpenMPT/mptrack/View_gen.h
   trunk/OpenMPT/soundlib/MIDIMacros.h
   trunk/OpenMPT/soundlib/PlayState.h
   trunk/OpenMPT/soundlib/Snd_defs.h
   trunk/OpenMPT/soundlib/plugins/PluginStructs.h

Modified: trunk/OpenMPT/mptrack/Childfrm.h
==============================================================================
--- trunk/OpenMPT/mptrack/Childfrm.h	Sat Nov 30 21:24:11 2024	(r22366)
+++ trunk/OpenMPT/mptrack/Childfrm.h	Sat Nov 30 21:41:34 2024	(r22367)
@@ -15,7 +15,6 @@
 #include "PatternCursor.h"
 
 #include "../common/FileReaderFwd.h"
-#include "../soundlib/plugins/PluginStructs.h"
 
 OPENMPT_NAMESPACE_BEGIN
 

Modified: trunk/OpenMPT/mptrack/MIDIMapping.h
==============================================================================
--- trunk/OpenMPT/mptrack/MIDIMapping.h	Sat Nov 30 21:24:11 2024	(r22366)
+++ trunk/OpenMPT/mptrack/MIDIMapping.h	Sat Nov 30 21:41:34 2024	(r22367)
@@ -14,7 +14,6 @@
 
 #include "../common/FileReaderFwd.h"
 #include "../soundlib/Snd_defs.h"
-#include "../soundlib/plugins/PluginStructs.h"
 
 #include <vector>
 #include <algorithm>

Modified: trunk/OpenMPT/mptrack/View_gen.h
==============================================================================
--- trunk/OpenMPT/mptrack/View_gen.h	Sat Nov 30 21:24:11 2024	(r22366)
+++ trunk/OpenMPT/mptrack/View_gen.h	Sat Nov 30 21:41:34 2024	(r22367)
@@ -16,7 +16,6 @@
 #include "ColorPickerButton.h"
 #include "PluginComboBox.h"
 #include "UpdateHints.h"
-#include "../soundlib/plugins/PluginStructs.h"
 
 OPENMPT_NAMESPACE_BEGIN
 

Modified: trunk/OpenMPT/soundlib/MIDIMacros.h
==============================================================================
--- trunk/OpenMPT/soundlib/MIDIMacros.h	Sat Nov 30 21:24:11 2024	(r22366)
+++ trunk/OpenMPT/soundlib/MIDIMacros.h	Sat Nov 30 21:41:34 2024	(r22367)
@@ -12,10 +12,13 @@
 
 #include "openmpt/all/BuildSettings.hpp"
 
+#include "Snd_defs.h"
 #include "openmpt/base/Endian.hpp"
 
 OPENMPT_NAMESPACE_BEGIN
 
+class IMixPlugin;
+
 enum
 {
 	kGlobalMacros = 9,    // Number of global macros
@@ -24,14 +27,6 @@
 	kMacroLength  = 32,   // Max number of chars per macro
 };
 
-OPENMPT_NAMESPACE_END
-
-#ifdef MODPLUG_TRACKER
-#include "plugins/PluginStructs.h"
-#endif // MODPLUG_TRACKER
-
-OPENMPT_NAMESPACE_BEGIN
-
 // Parametered macro presets
 enum ParameteredMacro
 {

Modified: trunk/OpenMPT/soundlib/PlayState.h
==============================================================================
--- trunk/OpenMPT/soundlib/PlayState.h	Sat Nov 30 21:24:11 2024	(r22366)
+++ trunk/OpenMPT/soundlib/PlayState.h	Sat Nov 30 21:41:34 2024	(r22367)
@@ -12,7 +12,6 @@
 
 #include "openmpt/all/BuildSettings.hpp"
 #include "ModChannel.h"
-#include "plugins/PluginStructs.h"
 #include "Snd_defs.h"
 
 #include <map>

Modified: trunk/OpenMPT/soundlib/Snd_defs.h
==============================================================================
--- trunk/OpenMPT/soundlib/Snd_defs.h	Sat Nov 30 21:24:11 2024	(r22366)
+++ trunk/OpenMPT/soundlib/Snd_defs.h	Sat Nov 30 21:41:34 2024	(r22367)
@@ -60,6 +60,9 @@
 
 using samplecount_t = uint32;  // Number of rendered samples
 
+using PlugParamIndex = uint32;
+using PlugParamValue = float;
+
 // String lengths (including trailing null char)
 enum
 {

Modified: trunk/OpenMPT/soundlib/plugins/PluginStructs.h
==============================================================================
--- trunk/OpenMPT/soundlib/plugins/PluginStructs.h	Sat Nov 30 21:24:11 2024	(r22366)
+++ trunk/OpenMPT/soundlib/plugins/PluginStructs.h	Sat Nov 30 21:41:34 2024	(r22367)
@@ -22,9 +22,6 @@
 ////////////////////////////////////////////////////////////////////
 // Mix Plugins
 
-using PlugParamIndex = uint32;
-using PlugParamValue = float;
-
 struct SNDMIXPLUGINSTATE;
 struct SNDMIXPLUGIN;
 class IMixPlugin;