[OMPT-svn-commit] SF.net SVN: modplug:[2521] trunk/OpenMPT

[<man...@us...>]

Revision: 2521
          http://sourceforge.net/p/modplug/code/2521
Author:   manxorist
Date:     2013-07-08 00:13:03 +0000 (Mon, 08 Jul 2013)
Log Message:
-----------
[Ref] libopenmpt: Make spacing in render param constant names consistent.

Modified Paths:
--------------
    trunk/OpenMPT/libopenmpt/libopenmpt.h
    trunk/OpenMPT/libopenmpt/libopenmpt.hpp
    trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp
    trunk/OpenMPT/libopenmpt/libopenmpt_modplug.c
    trunk/OpenMPT/libopenmpt/libopenmpt_winamp.cpp
    trunk/OpenMPT/libopenmpt/libopenmpt_xmplay.cpp
    trunk/OpenMPT/openmpt123/openmpt123.cpp

Modified: trunk/OpenMPT/libopenmpt/libopenmpt.h
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt.h	2013-07-07 23:40:28 UTC (rev 2520)
+++ trunk/OpenMPT/libopenmpt/libopenmpt.h	2013-07-08 00:13:03 UTC (rev 2521)
@@ -64,10 +64,10 @@
 
 LIBOPENMPT_API void openmpt_module_destroy( openmpt_module * mod );
 
-#define OPENMPT_MODULE_RENDER_MASTERGAIN_MILLIBEL          1
-#define OPENMPT_MODULE_RENDER_STEREOSEPARATION_PERCENT     2
-#define OPENMPT_MODULE_RENDER_INTERPOLATION_FILTER_LENGTH  3
-#define OPENMPT_MODULE_RENDER_VOLUMERAMPING_STRENGTH       4
+#define OPENMPT_MODULE_RENDER_MASTERGAIN_MILLIBEL        1
+#define OPENMPT_MODULE_RENDER_STEREOSEPARATION_PERCENT   2
+#define OPENMPT_MODULE_RENDER_INTERPOLATIONFILTER_LENGTH 3
+#define OPENMPT_MODULE_RENDER_VOLUMERAMPING_STRENGTH     4
 
 #define OPENMPT_MODULE_COMMAND_NOTE         0
 #define OPENMPT_MODULE_COMMAND_INSTRUMENT   1

Modified: trunk/OpenMPT/libopenmpt/libopenmpt.hpp
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt.hpp	2013-07-07 23:40:28 UTC (rev 2520)
+++ trunk/OpenMPT/libopenmpt/libopenmpt.hpp	2013-07-08 00:13:03 UTC (rev 2521)
@@ -74,10 +74,10 @@
 public:
 
 	enum render_param {
-		RENDER_MASTERGAIN_MILLIBEL          = 1,
-		RENDER_STEREOSEPARATION_PERCENT     = 2,
-		RENDER_INTERPOLATION_FILTER_LENGTH  = 3,
-		RENDER_VOLUMERAMPING_STRENGTH       = 4,
+		RENDER_MASTERGAIN_MILLIBEL        = 1,
+		RENDER_STEREOSEPARATION_PERCENT   = 2,
+		RENDER_INTERPOLATIONFILTER_LENGTH = 3,
+		RENDER_VOLUMERAMPING_STRENGTH     = 4,
 	};
 
 	enum command_index {

Modified: trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp	2013-07-07 23:40:28 UTC (rev 2520)
+++ trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp	2013-07-08 00:13:03 UTC (rev 2521)
@@ -350,7 +350,7 @@
 		case module::RENDER_STEREOSEPARATION_PERCENT: {
 			return m_sndFile->m_MixerSettings.m_nStereoSeparation * 100 / 128;
 		} break;
-		case module::RENDER_INTERPOLATION_FILTER_LENGTH: {
+		case module::RENDER_INTERPOLATIONFILTER_LENGTH: {
 			return resamplingmode_to_filterlength( m_sndFile->m_Resampler.m_Settings.SrcMode );
 		} break;
 		case module::RENDER_VOLUMERAMPING_STRENGTH: {
@@ -380,7 +380,7 @@
 				m_sndFile->SetMixerSettings( settings );
 			}
 		} break;
-		case module::RENDER_INTERPOLATION_FILTER_LENGTH: {
+		case module::RENDER_INTERPOLATIONFILTER_LENGTH: {
 			CResamplerSettings newsettings;
 			newsettings.SrcMode = filterlength_to_resamplingmode( value );
 			if ( newsettings != m_sndFile->m_Resampler.m_Settings ) {

Modified: trunk/OpenMPT/libopenmpt/libopenmpt_modplug.c
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt_modplug.c	2013-07-07 23:40:28 UTC (rev 2520)
+++ trunk/OpenMPT/libopenmpt/libopenmpt_modplug.c	2013-07-08 00:13:03 UTC (rev 2521)
@@ -132,7 +132,7 @@
 	file->name = openmpt_module_get_metadata(file->mod,"title");
 	file->message = openmpt_module_get_metadata(file->mod,"message");
 	openmpt_module_set_render_param(file->mod,OPENMPT_MODULE_RENDER_STEREOSEPARATION_PERCENT,file->settings.mStereoSeparation*100/128);
-	openmpt_module_set_render_param(file->mod,OPENMPT_MODULE_RENDER_INTERPOLATION_FILTER_LENGTH,modplugresamplingmode_to_filterlength(file->settings.mResamplingMode));
+	openmpt_module_set_render_param(file->mod,OPENMPT_MODULE_RENDER_INTERPOLATIONFILTER_LENGTH,modplugresamplingmode_to_filterlength(file->settings.mResamplingMode));
 	return file;
 }
 

Modified: trunk/OpenMPT/libopenmpt/libopenmpt_winamp.cpp
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt_winamp.cpp	2013-07-07 23:40:28 UTC (rev 2520)
+++ trunk/OpenMPT/libopenmpt/libopenmpt_winamp.cpp	2013-07-08 00:13:03 UTC (rev 2521)
@@ -99,7 +99,7 @@
 		self->mod->set_repeat_count( self->settings.repeatcount );
 		self->mod->set_render_param( openmpt::module::RENDER_MASTERGAIN_MILLIBEL, self->settings.mastergain_millibel );
 		self->mod->set_render_param( openmpt::module::RENDER_STEREOSEPARATION_PERCENT, self->settings.stereoseparation );
-		self->mod->set_render_param( openmpt::module::RENDER_INTERPOLATION_FILTER_LENGTH, self->settings.interpolationfilterlength );
+		self->mod->set_render_param( openmpt::module::RENDER_INTERPOLATIONFILTER_LENGTH, self->settings.interpolationfilterlength );
 		self->mod->set_render_param( openmpt::module::RENDER_VOLUMERAMPING_STRENGTH, self->settings.ramping );
 	}
 	if ( settings_dll ) {

Modified: trunk/OpenMPT/libopenmpt/libopenmpt_xmplay.cpp
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt_xmplay.cpp	2013-07-07 23:40:28 UTC (rev 2520)
+++ trunk/OpenMPT/libopenmpt/libopenmpt_xmplay.cpp	2013-07-08 00:13:03 UTC (rev 2521)
@@ -133,7 +133,7 @@
 		self->mod->set_repeat_count( self->settings.repeatcount );
 		self->mod->set_render_param( openmpt::module::RENDER_MASTERGAIN_MILLIBEL, self->settings.mastergain_millibel );
 		self->mod->set_render_param( openmpt::module::RENDER_STEREOSEPARATION_PERCENT, self->settings.stereoseparation );
-		self->mod->set_render_param( openmpt::module::RENDER_INTERPOLATION_FILTER_LENGTH, self->settings.interpolationfilterlength );
+		self->mod->set_render_param( openmpt::module::RENDER_INTERPOLATIONFILTER_LENGTH, self->settings.interpolationfilterlength );
 		self->mod->set_render_param( openmpt::module::RENDER_VOLUMERAMPING_STRENGTH, self->settings.ramping );
 	}
 }

Modified: trunk/OpenMPT/openmpt123/openmpt123.cpp
===================================================================
--- trunk/OpenMPT/openmpt123/openmpt123.cpp	2013-07-07 23:40:28 UTC (rev 2520)
+++ trunk/OpenMPT/openmpt123/openmpt123.cpp	2013-07-08 00:13:03 UTC (rev 2521)
@@ -332,7 +332,7 @@
 	flags.ramping    = std::max( flags.ramping,    -1 );
 	mod.set_render_param( openmpt::module::RENDER_MASTERGAIN_MILLIBEL, flags.gain );
 	mod.set_render_param( openmpt::module::RENDER_STEREOSEPARATION_PERCENT, flags.separation );
-	mod.set_render_param( openmpt::module::RENDER_INTERPOLATION_FILTER_LENGTH, flags.filtertaps );
+	mod.set_render_param( openmpt::module::RENDER_INTERPOLATIONFILTER_LENGTH, flags.filtertaps );
 	mod.set_render_param( openmpt::module::RENDER_VOLUMERAMPING_STRENGTH, flags.ramping );
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.