Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[4073] trunk/OpenMPT
|
From: <man...@us...> - 2014-05-31 16:58:44
|
Revision: 4073
http://sourceforge.net/p/modplug/code/4073
Author: manxorist
Date: 2014-05-31 16:58:08 +0000 (Sat, 31 May 2014)
Log Message:
-----------
[Fix] Namespace the whole internal codebase in a separate OpenMPT:: namespace for libopenmpt. This allows applications to statically link against libopenmpt without risking duplicate symbols. In particular, this allows static linking of both, libopenmpt and the older libmodplug, in the same binary. Namespacing is wrapped in three macros, OPENMPT_NAMESPACE, OPENMPT_NAMESPACE_BEGIN and OPENMPT_NAMESPACE_END. OpenMPT itself is also modified to support namespaced compilation. As this causes all symbols in the debugger (and potentially other code analysis tools (e.g. doxygen)) to be prefixed with "OpenMPT::" (which can be kind of annoying), OpenMPT currently defines these macros empty, the code thereby continues to reside in the global namespace for OpenMPT. Compilaion has been verified to work in namespaced form for OpenMPT (see BuildSettings.h, MidiInOut.h, MidiInOutEditor.h and Bridge.cpp for places where to adjust the namespace).
[Ref] Small related cleanups.
Modified Paths:
--------------
trunk/OpenMPT/common/AudioCriticalSection.cpp
trunk/OpenMPT/common/AudioCriticalSection.h
trunk/OpenMPT/common/BuildSettings.h
trunk/OpenMPT/common/FlagSet.h
trunk/OpenMPT/common/Logging.cpp
trunk/OpenMPT/common/Logging.h
trunk/OpenMPT/common/Profiler.cpp
trunk/OpenMPT/common/Profiler.h
trunk/OpenMPT/common/StringFixer.h
trunk/OpenMPT/common/misc_util.cpp
trunk/OpenMPT/common/misc_util.h
trunk/OpenMPT/common/mptFstream.h
trunk/OpenMPT/common/mptPathString.cpp
trunk/OpenMPT/common/mptPathString.h
trunk/OpenMPT/common/mptString.cpp
trunk/OpenMPT/common/mptString.h
trunk/OpenMPT/common/mutex.h
trunk/OpenMPT/common/serialization_utils.cpp
trunk/OpenMPT/common/serialization_utils.h
trunk/OpenMPT/common/thread.h
trunk/OpenMPT/common/typedefs.cpp
trunk/OpenMPT/common/typedefs.h
trunk/OpenMPT/common/version.cpp
trunk/OpenMPT/common/version.h
trunk/OpenMPT/common/versionNumber.h
trunk/OpenMPT/include/unrar/openmpt-callback.hpp
trunk/OpenMPT/libopenmpt/libopenmpt_ext.cpp
trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp
trunk/OpenMPT/libopenmpt/libopenmpt_impl.hpp
trunk/OpenMPT/libopenmpt/libopenmpt_test.cpp
trunk/OpenMPT/mptrack/AboutDialog.cpp
trunk/OpenMPT/mptrack/AboutDialog.h
trunk/OpenMPT/mptrack/AbstractVstEditor.cpp
trunk/OpenMPT/mptrack/AbstractVstEditor.h
trunk/OpenMPT/mptrack/AppendModule.cpp
trunk/OpenMPT/mptrack/AutoSaver.cpp
trunk/OpenMPT/mptrack/AutoSaver.h
trunk/OpenMPT/mptrack/Autotune.cpp
trunk/OpenMPT/mptrack/Autotune.h
trunk/OpenMPT/mptrack/CImageListEx.cpp
trunk/OpenMPT/mptrack/CImageListEx.h
trunk/OpenMPT/mptrack/CTreeCtrl.h
trunk/OpenMPT/mptrack/ChannelManagerDlg.cpp
trunk/OpenMPT/mptrack/ChannelManagerDlg.h
trunk/OpenMPT/mptrack/Childfrm.cpp
trunk/OpenMPT/mptrack/Childfrm.h
trunk/OpenMPT/mptrack/CleanupSong.cpp
trunk/OpenMPT/mptrack/CleanupSong.h
trunk/OpenMPT/mptrack/CloseMainDialog.cpp
trunk/OpenMPT/mptrack/CloseMainDialog.h
trunk/OpenMPT/mptrack/ColourEdit.cpp
trunk/OpenMPT/mptrack/ColourEdit.h
trunk/OpenMPT/mptrack/CommandSet.cpp
trunk/OpenMPT/mptrack/CommandSet.h
trunk/OpenMPT/mptrack/CreditStatic.cpp
trunk/OpenMPT/mptrack/CreditStatic.h
trunk/OpenMPT/mptrack/Ctrl_com.cpp
trunk/OpenMPT/mptrack/Ctrl_com.h
trunk/OpenMPT/mptrack/Ctrl_gen.cpp
trunk/OpenMPT/mptrack/Ctrl_gen.h
trunk/OpenMPT/mptrack/Ctrl_ins.cpp
trunk/OpenMPT/mptrack/Ctrl_ins.h
trunk/OpenMPT/mptrack/Ctrl_pat.cpp
trunk/OpenMPT/mptrack/Ctrl_pat.h
trunk/OpenMPT/mptrack/Ctrl_seq.cpp
trunk/OpenMPT/mptrack/Ctrl_smp.cpp
trunk/OpenMPT/mptrack/Ctrl_smp.h
trunk/OpenMPT/mptrack/DefaultVstEditor.cpp
trunk/OpenMPT/mptrack/DefaultVstEditor.h
trunk/OpenMPT/mptrack/Draw_pat.cpp
trunk/OpenMPT/mptrack/EffectInfo.cpp
trunk/OpenMPT/mptrack/EffectInfo.h
trunk/OpenMPT/mptrack/EffectVis.cpp
trunk/OpenMPT/mptrack/EffectVis.h
trunk/OpenMPT/mptrack/ExceptionHandler.cpp
trunk/OpenMPT/mptrack/ExceptionHandler.h
trunk/OpenMPT/mptrack/FileDialog.cpp
trunk/OpenMPT/mptrack/FileDialog.h
trunk/OpenMPT/mptrack/Globals.cpp
trunk/OpenMPT/mptrack/Globals.h
trunk/OpenMPT/mptrack/InputHandler.cpp
trunk/OpenMPT/mptrack/InputHandler.h
trunk/OpenMPT/mptrack/KeyConfigDlg.cpp
trunk/OpenMPT/mptrack/KeyConfigDlg.h
trunk/OpenMPT/mptrack/MIDIMacroDialog.cpp
trunk/OpenMPT/mptrack/MIDIMacroDialog.h
trunk/OpenMPT/mptrack/MIDIMapping.cpp
trunk/OpenMPT/mptrack/MIDIMapping.h
trunk/OpenMPT/mptrack/MIDIMappingDialog.cpp
trunk/OpenMPT/mptrack/MIDIMappingDialog.h
trunk/OpenMPT/mptrack/MPTHacks.cpp
trunk/OpenMPT/mptrack/MPTrackUtil.cpp
trunk/OpenMPT/mptrack/MPTrackUtil.h
trunk/OpenMPT/mptrack/MainFrm.cpp
trunk/OpenMPT/mptrack/Mainbar.cpp
trunk/OpenMPT/mptrack/Mainbar.h
trunk/OpenMPT/mptrack/Mainfrm.h
trunk/OpenMPT/mptrack/MemoryMappedFile.cpp
trunk/OpenMPT/mptrack/MemoryMappedFile.h
trunk/OpenMPT/mptrack/Mod2wave.cpp
trunk/OpenMPT/mptrack/ModConvert.cpp
trunk/OpenMPT/mptrack/ModConvert.h
trunk/OpenMPT/mptrack/Moddoc.cpp
trunk/OpenMPT/mptrack/Moddoc.h
trunk/OpenMPT/mptrack/Modedit.cpp
trunk/OpenMPT/mptrack/Moptions.cpp
trunk/OpenMPT/mptrack/Moptions.h
trunk/OpenMPT/mptrack/MoveFXSlotDialog.cpp
trunk/OpenMPT/mptrack/MoveFXSlotDialog.h
trunk/OpenMPT/mptrack/Mpdlgs.cpp
trunk/OpenMPT/mptrack/Mpdlgs.h
trunk/OpenMPT/mptrack/Mpt_midi.cpp
trunk/OpenMPT/mptrack/Mptrack.cpp
trunk/OpenMPT/mptrack/Mptrack.h
trunk/OpenMPT/mptrack/Notification.h
trunk/OpenMPT/mptrack/PNG.cpp
trunk/OpenMPT/mptrack/PNG.h
trunk/OpenMPT/mptrack/PSRatioCalc.cpp
trunk/OpenMPT/mptrack/PSRatioCalc.h
trunk/OpenMPT/mptrack/PatternClipboard.cpp
trunk/OpenMPT/mptrack/PatternClipboard.h
trunk/OpenMPT/mptrack/PatternCursor.h
trunk/OpenMPT/mptrack/PatternEditorDialogs.cpp
trunk/OpenMPT/mptrack/PatternEditorDialogs.h
trunk/OpenMPT/mptrack/PatternGotoDialog.cpp
trunk/OpenMPT/mptrack/PatternGotoDialog.h
trunk/OpenMPT/mptrack/Reporting.cpp
trunk/OpenMPT/mptrack/Reporting.h
trunk/OpenMPT/mptrack/SampleEditorDialogs.cpp
trunk/OpenMPT/mptrack/SampleEditorDialogs.h
trunk/OpenMPT/mptrack/ScaleEnvPointsDlg.cpp
trunk/OpenMPT/mptrack/ScaleEnvPointsDlg.h
trunk/OpenMPT/mptrack/SelectPluginDialog.cpp
trunk/OpenMPT/mptrack/SelectPluginDialog.h
trunk/OpenMPT/mptrack/Settings.cpp
trunk/OpenMPT/mptrack/Settings.h
trunk/OpenMPT/mptrack/StreamEncoder.cpp
trunk/OpenMPT/mptrack/StreamEncoder.h
trunk/OpenMPT/mptrack/StreamEncoderFLAC.cpp
trunk/OpenMPT/mptrack/StreamEncoderFLAC.h
trunk/OpenMPT/mptrack/StreamEncoderMP3.cpp
trunk/OpenMPT/mptrack/StreamEncoderMP3.h
trunk/OpenMPT/mptrack/StreamEncoderOpus.cpp
trunk/OpenMPT/mptrack/StreamEncoderOpus.h
trunk/OpenMPT/mptrack/StreamEncoderVorbis.cpp
trunk/OpenMPT/mptrack/StreamEncoderVorbis.h
trunk/OpenMPT/mptrack/StreamEncoderWAV.cpp
trunk/OpenMPT/mptrack/StreamEncoderWAV.h
trunk/OpenMPT/mptrack/TrackerSettings.cpp
trunk/OpenMPT/mptrack/TrackerSettings.h
trunk/OpenMPT/mptrack/TuningDialog.cpp
trunk/OpenMPT/mptrack/TuningDialog.h
trunk/OpenMPT/mptrack/Undo.cpp
trunk/OpenMPT/mptrack/Undo.h
trunk/OpenMPT/mptrack/UpdateCheck.cpp
trunk/OpenMPT/mptrack/UpdateCheck.h
trunk/OpenMPT/mptrack/VSTEditor.cpp
trunk/OpenMPT/mptrack/VSTEditor.h
trunk/OpenMPT/mptrack/View_gen.cpp
trunk/OpenMPT/mptrack/View_gen.h
trunk/OpenMPT/mptrack/View_ins.cpp
trunk/OpenMPT/mptrack/View_ins.h
trunk/OpenMPT/mptrack/View_pat.cpp
trunk/OpenMPT/mptrack/View_pat.h
trunk/OpenMPT/mptrack/View_smp.cpp
trunk/OpenMPT/mptrack/View_smp.h
trunk/OpenMPT/mptrack/View_tre.cpp
trunk/OpenMPT/mptrack/View_tre.h
trunk/OpenMPT/mptrack/VstPresets.cpp
trunk/OpenMPT/mptrack/VstPresets.h
trunk/OpenMPT/mptrack/Vstplug.cpp
trunk/OpenMPT/mptrack/Vstplug.h
trunk/OpenMPT/mptrack/dlg_misc.cpp
trunk/OpenMPT/mptrack/dlg_misc.h
trunk/OpenMPT/mptrack/mod2midi.cpp
trunk/OpenMPT/mptrack/mod2midi.h
trunk/OpenMPT/mptrack/mod2wave.h
trunk/OpenMPT/mptrack/tuningRatioMapWnd.cpp
trunk/OpenMPT/mptrack/tuningRatioMapWnd.h
trunk/OpenMPT/mptrack/view_com.cpp
trunk/OpenMPT/mptrack/view_com.h
trunk/OpenMPT/pluginBridge/AEffectWrapper.h
trunk/OpenMPT/pluginBridge/Bridge.cpp
trunk/OpenMPT/pluginBridge/Bridge.h
trunk/OpenMPT/pluginBridge/BridgeCommon.h
trunk/OpenMPT/pluginBridge/BridgeWrapper.cpp
trunk/OpenMPT/pluginBridge/BridgeWrapper.h
trunk/OpenMPT/plugins/MidiInOut/MidiInOut.cpp
trunk/OpenMPT/plugins/MidiInOut/MidiInOut.h
trunk/OpenMPT/plugins/MidiInOut/MidiInOut.vcxproj
trunk/OpenMPT/plugins/MidiInOut/MidiInOut.vcxproj.filters
trunk/OpenMPT/plugins/MidiInOut/MidiInOutEditor.cpp
trunk/OpenMPT/plugins/MidiInOut/MidiInOutEditor.h
trunk/OpenMPT/plugins/common/Button.h
trunk/OpenMPT/plugins/common/CheckBox.h
trunk/OpenMPT/plugins/common/ComboBox.h
trunk/OpenMPT/plugins/common/EditBox.h
trunk/OpenMPT/plugins/common/Label.h
trunk/OpenMPT/plugins/common/Window.h
trunk/OpenMPT/plugins/common/WindowBase.h
trunk/OpenMPT/sounddev/SoundDevice.cpp
trunk/OpenMPT/sounddev/SoundDevice.h
trunk/OpenMPT/sounddev/SoundDeviceASIO.cpp
trunk/OpenMPT/sounddev/SoundDeviceASIO.h
trunk/OpenMPT/sounddev/SoundDeviceDirectSound.cpp
trunk/OpenMPT/sounddev/SoundDeviceDirectSound.h
trunk/OpenMPT/sounddev/SoundDevicePortAudio.cpp
trunk/OpenMPT/sounddev/SoundDevicePortAudio.h
trunk/OpenMPT/sounddev/SoundDeviceThread.cpp
trunk/OpenMPT/sounddev/SoundDeviceThread.h
trunk/OpenMPT/sounddev/SoundDeviceWaveout.cpp
trunk/OpenMPT/sounddev/SoundDeviceWaveout.h
trunk/OpenMPT/sounddsp/AGC.cpp
trunk/OpenMPT/sounddsp/AGC.h
trunk/OpenMPT/sounddsp/DSP.cpp
trunk/OpenMPT/sounddsp/DSP.h
trunk/OpenMPT/sounddsp/EQ.cpp
trunk/OpenMPT/sounddsp/EQ.h
trunk/OpenMPT/sounddsp/Reverb.cpp
trunk/OpenMPT/sounddsp/Reverb.h
trunk/OpenMPT/soundlib/AudioReadTarget.h
trunk/OpenMPT/soundlib/ChunkReader.h
trunk/OpenMPT/soundlib/Dither.cpp
trunk/OpenMPT/soundlib/Dither.h
trunk/OpenMPT/soundlib/Dlsbank.cpp
trunk/OpenMPT/soundlib/Dlsbank.h
trunk/OpenMPT/soundlib/Endianness.h
trunk/OpenMPT/soundlib/Fastmix.cpp
trunk/OpenMPT/soundlib/FileReader.h
trunk/OpenMPT/soundlib/FloatMixer.h
trunk/OpenMPT/soundlib/ITCompression.cpp
trunk/OpenMPT/soundlib/ITCompression.h
trunk/OpenMPT/soundlib/ITTools.cpp
trunk/OpenMPT/soundlib/ITTools.h
trunk/OpenMPT/soundlib/IntMixer.h
trunk/OpenMPT/soundlib/Load_669.cpp
trunk/OpenMPT/soundlib/Load_amf.cpp
trunk/OpenMPT/soundlib/Load_ams.cpp
trunk/OpenMPT/soundlib/Load_dbm.cpp
trunk/OpenMPT/soundlib/Load_digi.cpp
trunk/OpenMPT/soundlib/Load_dmf.cpp
trunk/OpenMPT/soundlib/Load_dsm.cpp
trunk/OpenMPT/soundlib/Load_far.cpp
trunk/OpenMPT/soundlib/Load_gdm.cpp
trunk/OpenMPT/soundlib/Load_imf.cpp
trunk/OpenMPT/soundlib/Load_it.cpp
trunk/OpenMPT/soundlib/Load_itp.cpp
trunk/OpenMPT/soundlib/Load_mdl.cpp
trunk/OpenMPT/soundlib/Load_med.cpp
trunk/OpenMPT/soundlib/Load_mid.cpp
trunk/OpenMPT/soundlib/Load_mo3.cpp
trunk/OpenMPT/soundlib/Load_mod.cpp
trunk/OpenMPT/soundlib/Load_mt2.cpp
trunk/OpenMPT/soundlib/Load_mtm.cpp
trunk/OpenMPT/soundlib/Load_okt.cpp
trunk/OpenMPT/soundlib/Load_psm.cpp
trunk/OpenMPT/soundlib/Load_ptm.cpp
trunk/OpenMPT/soundlib/Load_s3m.cpp
trunk/OpenMPT/soundlib/Load_stm.cpp
trunk/OpenMPT/soundlib/Load_ult.cpp
trunk/OpenMPT/soundlib/Load_umx.cpp
trunk/OpenMPT/soundlib/Load_wav.cpp
trunk/OpenMPT/soundlib/Load_xm.cpp
trunk/OpenMPT/soundlib/Loaders.h
trunk/OpenMPT/soundlib/MIDIEvents.cpp
trunk/OpenMPT/soundlib/MIDIEvents.h
trunk/OpenMPT/soundlib/MIDIMacros.cpp
trunk/OpenMPT/soundlib/MIDIMacros.h
trunk/OpenMPT/soundlib/Message.cpp
trunk/OpenMPT/soundlib/Message.h
trunk/OpenMPT/soundlib/Mixer.h
trunk/OpenMPT/soundlib/MixerInterface.h
trunk/OpenMPT/soundlib/MixerLoops.cpp
trunk/OpenMPT/soundlib/MixerLoops.h
trunk/OpenMPT/soundlib/MixerSettings.cpp
trunk/OpenMPT/soundlib/MixerSettings.h
trunk/OpenMPT/soundlib/Mmcmp.cpp
trunk/OpenMPT/soundlib/ModChannel.cpp
trunk/OpenMPT/soundlib/ModChannel.h
trunk/OpenMPT/soundlib/ModInstrument.cpp
trunk/OpenMPT/soundlib/ModInstrument.h
trunk/OpenMPT/soundlib/ModSample.cpp
trunk/OpenMPT/soundlib/ModSample.h
trunk/OpenMPT/soundlib/ModSequence.cpp
trunk/OpenMPT/soundlib/ModSequence.h
trunk/OpenMPT/soundlib/Resampler.h
trunk/OpenMPT/soundlib/RowVisitor.cpp
trunk/OpenMPT/soundlib/RowVisitor.h
trunk/OpenMPT/soundlib/S3MTools.cpp
trunk/OpenMPT/soundlib/S3MTools.h
trunk/OpenMPT/soundlib/SampleFormat.h
trunk/OpenMPT/soundlib/SampleFormatConverters.h
trunk/OpenMPT/soundlib/SampleFormats.cpp
trunk/OpenMPT/soundlib/SampleIO.cpp
trunk/OpenMPT/soundlib/SampleIO.h
trunk/OpenMPT/soundlib/Snd_defs.h
trunk/OpenMPT/soundlib/Snd_flt.cpp
trunk/OpenMPT/soundlib/Snd_fx.cpp
trunk/OpenMPT/soundlib/Sndfile.cpp
trunk/OpenMPT/soundlib/Sndfile.h
trunk/OpenMPT/soundlib/Sndmix.cpp
trunk/OpenMPT/soundlib/SoundFilePlayConfig.cpp
trunk/OpenMPT/soundlib/SoundFilePlayConfig.h
trunk/OpenMPT/soundlib/Tables.cpp
trunk/OpenMPT/soundlib/Tables.h
trunk/OpenMPT/soundlib/Tagging.cpp
trunk/OpenMPT/soundlib/Tagging.h
trunk/OpenMPT/soundlib/WAVTools.cpp
trunk/OpenMPT/soundlib/WAVTools.h
trunk/OpenMPT/soundlib/Wav.h
trunk/OpenMPT/soundlib/WindowedFIR.cpp
trunk/OpenMPT/soundlib/WindowedFIR.h
trunk/OpenMPT/soundlib/XMTools.cpp
trunk/OpenMPT/soundlib/XMTools.h
trunk/OpenMPT/soundlib/load_j2b.cpp
trunk/OpenMPT/soundlib/mod_specifications.cpp
trunk/OpenMPT/soundlib/mod_specifications.h
trunk/OpenMPT/soundlib/modcommand.cpp
trunk/OpenMPT/soundlib/modcommand.h
trunk/OpenMPT/soundlib/modsmp_ctrl.cpp
trunk/OpenMPT/soundlib/modsmp_ctrl.h
trunk/OpenMPT/soundlib/pattern.cpp
trunk/OpenMPT/soundlib/pattern.h
trunk/OpenMPT/soundlib/patternContainer.cpp
trunk/OpenMPT/soundlib/patternContainer.h
trunk/OpenMPT/soundlib/plugins/DmoToVst.cpp
trunk/OpenMPT/soundlib/plugins/PlugInterface.h
trunk/OpenMPT/soundlib/plugins/PluginEventQueue.h
trunk/OpenMPT/soundlib/plugins/PluginManager.cpp
trunk/OpenMPT/soundlib/plugins/PluginMixBuffer.h
trunk/OpenMPT/soundlib/tuning.cpp
trunk/OpenMPT/soundlib/tuning.h
trunk/OpenMPT/soundlib/tuningCollection.cpp
trunk/OpenMPT/soundlib/tuningbase.cpp
trunk/OpenMPT/soundlib/tuningbase.h
trunk/OpenMPT/soundlib/tuningcollection.h
trunk/OpenMPT/test/TestToolsLib.cpp
trunk/OpenMPT/test/TestToolsLib.h
trunk/OpenMPT/test/TestToolsTracker.h
trunk/OpenMPT/test/test.cpp
trunk/OpenMPT/test/test.h
trunk/OpenMPT/unarchiver/archive.h
trunk/OpenMPT/unarchiver/unarchiver.cpp
trunk/OpenMPT/unarchiver/unarchiver.h
trunk/OpenMPT/unarchiver/ungzip.cpp
trunk/OpenMPT/unarchiver/ungzip.h
trunk/OpenMPT/unarchiver/unlha.cpp
trunk/OpenMPT/unarchiver/unlha.h
trunk/OpenMPT/unarchiver/unrar.cpp
trunk/OpenMPT/unarchiver/unrar.h
trunk/OpenMPT/unarchiver/unzip.cpp
trunk/OpenMPT/unarchiver/unzip.h
Modified: trunk/OpenMPT/common/AudioCriticalSection.cpp
===================================================================
--- trunk/OpenMPT/common/AudioCriticalSection.cpp 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/common/AudioCriticalSection.cpp 2014-05-31 16:58:08 UTC (rev 4073)
@@ -11,8 +11,11 @@
#include "../common/AudioCriticalSection.h"
+OPENMPT_NAMESPACE_BEGIN
+
#ifdef MODPLUG_TRACKER
CRITICAL_SECTION g_csAudio;
int g_csAudioLockCount = 0;
#endif
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/common/AudioCriticalSection.h
===================================================================
--- trunk/OpenMPT/common/AudioCriticalSection.h 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/common/AudioCriticalSection.h 2014-05-31 16:58:08 UTC (rev 4073)
@@ -9,13 +9,10 @@
#pragma once
+OPENMPT_NAMESPACE_BEGIN
+
#ifdef MODPLUG_TRACKER
-#define WIN32_LEAN_AND_MEAN
-#define VC_EXTRALEAN
-#define NOMINMAX
-#include <windows.h>
-
extern CRITICAL_SECTION g_csAudio;
extern int g_csAudioLockCount;
@@ -86,3 +83,5 @@
};
#endif // MODPLUG_TRACKER
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/common/BuildSettings.h
===================================================================
--- trunk/OpenMPT/common/BuildSettings.h 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/common/BuildSettings.h 2014-05-31 16:58:08 UTC (rev 4073)
@@ -288,6 +288,46 @@
+#if defined(MODPLUG_TRACKER)
+#ifndef MPT_NO_NAMESPACE
+#define MPT_NO_NAMESPACE
+#endif
+#endif
+
+#if defined(MPT_NO_NAMESPACE)
+
+#ifdef OPENMPT_NAMESPACE
+#undef OPENMPT_NAMESPACE
+#endif
+#define OPENMPT_NAMESPACE
+
+#ifdef OPENMPT_NAMESPACE_BEGIN
+#undef OPENMPT_NAMESPACE_BEGIN
+#endif
+#define OPENMPT_NAMESPACE_BEGIN
+
+#ifdef OPENMPT_NAMESPACE_END
+#undef OPENMPT_NAMESPACE_END
+#endif
+#define OPENMPT_NAMESPACE_END
+
+#else
+
+#ifndef OPENMPT_NAMESPACE
+#define OPENMPT_NAMESPACE OpenMPT
+#endif
+
+#ifndef OPENMPT_NAMESPACE_BEGIN
+#define OPENMPT_NAMESPACE_BEGIN namespace OPENMPT_NAMESPACE {
+#endif
+#ifndef OPENMPT_NAMESPACE_END
+#define OPENMPT_NAMESPACE_END }
+#endif
+
+#endif
+
+
+
#if MPT_COMPILER_MSVC
#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
#endif
Modified: trunk/OpenMPT/common/FlagSet.h
===================================================================
--- trunk/OpenMPT/common/FlagSet.h 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/common/FlagSet.h 2014-05-31 16:58:08 UTC (rev 4073)
@@ -12,6 +12,8 @@
#include <string>
+OPENMPT_NAMESPACE_BEGIN
+
template <typename enum_t, typename store_t = enum_t>
class FlagSet
{
@@ -171,3 +173,6 @@
inline enum_t &operator &= (enum_t &a, enum_t b) { a = (a & b); return a; } \
inline enum_t &operator |= (enum_t &a, enum_t b) { a = (a | b); return a; } \
inline enum_t operator ~ (enum_t a) { return static_cast<enum_t>(~(+a)); }
+
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/common/Logging.cpp
===================================================================
--- trunk/OpenMPT/common/Logging.cpp 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/common/Logging.cpp 2014-05-31 16:58:08 UTC (rev 4073)
@@ -16,6 +16,9 @@
#include <cstring>
+OPENMPT_NAMESPACE_BEGIN
+
+
//#define LOG_TO_FILE
@@ -196,3 +199,6 @@
} // namespace log
} // namespace mpt
+
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/common/Logging.h
===================================================================
--- trunk/OpenMPT/common/Logging.h 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/common/Logging.h 2014-05-31 16:58:08 UTC (rev 4073)
@@ -10,6 +10,9 @@
#pragma once
+OPENMPT_NAMESPACE_BEGIN
+
+
enum LogLevel
{
/*LogDebug = 1,*/
@@ -62,7 +65,7 @@
Context(const Context &c);
}; // class Context
-#define MPT_LOG_CURRENTCONTEXT() ::mpt::log::Context( __FILE__ , __LINE__ , __FUNCTION__ )
+#define MPT_LOG_CURRENTCONTEXT() mpt::log::Context( __FILE__ , __LINE__ , __FUNCTION__ )
class Logger
@@ -76,7 +79,7 @@
void operator () (const std::wstring &text);
};
-#define Log ::mpt::log::Logger(MPT_LOG_CURRENTCONTEXT())
+#define Log mpt::log::Logger(MPT_LOG_CURRENTCONTEXT())
#else // !NO_LOGGING
@@ -90,7 +93,7 @@
inline void operator () (const std::wstring & /*text*/ ) {}
};
-#define Log if(true) {} else ::mpt::log::Logger() // completely compile out arguments to Log() so that they do not even get evaluated
+#define Log if(true) {} else mpt::log::Logger() // completely compile out arguments to Log() so that they do not even get evaluated
#endif // NO_LOGGING
@@ -98,3 +101,6 @@
} // namespace log
} // namespace mpt
+
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/common/Profiler.cpp
===================================================================
--- trunk/OpenMPT/common/Profiler.cpp 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/common/Profiler.cpp 2014-05-31 16:58:08 UTC (rev 4073)
@@ -12,6 +12,9 @@
#include "Profiler.h"
+OPENMPT_NAMESPACE_BEGIN
+
+
#ifdef USE_PROFILER
@@ -209,3 +212,6 @@
#endif // USE_PROFILER
+
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/common/Profiler.h
===================================================================
--- trunk/OpenMPT/common/Profiler.h 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/common/Profiler.h 2014-05-31 16:58:08 UTC (rev 4073)
@@ -16,6 +16,9 @@
#include <vector>
+OPENMPT_NAMESPACE_BEGIN
+
+
#if defined(MODPLUG_TRACKER)
//#define USE_PROFILER
@@ -117,3 +120,6 @@
#endif // USE_PROFILER
+
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/common/StringFixer.h
===================================================================
--- trunk/OpenMPT/common/StringFixer.h 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/common/StringFixer.h 2014-05-31 16:58:08 UTC (rev 4073)
@@ -16,6 +16,8 @@
#include <cstring>
#include <string.h>
+OPENMPT_NAMESPACE_BEGIN
+
namespace mpt { namespace String
{
@@ -416,3 +418,4 @@
} } // namespace mpt::String
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/common/misc_util.cpp
===================================================================
--- trunk/OpenMPT/common/misc_util.cpp 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/common/misc_util.cpp 2014-05-31 16:58:08 UTC (rev 4073)
@@ -27,6 +27,9 @@
#endif
+OPENMPT_NAMESPACE_BEGIN
+
+
template<typename T>
inline T ConvertStrToHelper(const std::string &str)
{
@@ -1042,3 +1045,6 @@
#endif // MPT_WITH_DYNBIND
+
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/common/misc_util.h
===================================================================
--- trunk/OpenMPT/common/misc_util.h 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/common/misc_util.h 2014-05-31 16:58:08 UTC (rev 4073)
@@ -23,6 +23,9 @@
#include <time.h>
+OPENMPT_NAMESPACE_BEGIN
+
+
bool ConvertStrToBool(const std::string &str);
signed char ConvertStrToSignedChar(const std::string &str);
unsigned char ConvertStrToUnsignedChar(const std::string &str);
@@ -830,3 +833,5 @@
#endif // MPT_WITH_DYNBIND
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/common/mptFstream.h
===================================================================
--- trunk/OpenMPT/common/mptFstream.h 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/common/mptFstream.h 2014-05-31 16:58:08 UTC (rev 4073)
@@ -14,6 +14,8 @@
#include "../common/mptString.h"
#include "../common/mptPathString.h"
+OPENMPT_NAMESPACE_BEGIN
+
#if defined(MPT_WITH_PATHSTRING)
namespace mpt
@@ -197,3 +199,4 @@
#endif // MPT_WITH_PATHSTRING
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/common/mptPathString.cpp
===================================================================
--- trunk/OpenMPT/common/mptPathString.cpp 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/common/mptPathString.cpp 2014-05-31 16:58:08 UTC (rev 4073)
@@ -11,6 +11,9 @@
#include "mptPathString.h"
+OPENMPT_NAMESPACE_BEGIN
+
+
#if defined(MPT_WITH_PATHSTRING)
#if defined(MODPLUG_TRACKER)
@@ -309,3 +312,5 @@
#endif // MPT_WITH_PATHSTRING
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/common/mptPathString.h
===================================================================
--- trunk/OpenMPT/common/mptPathString.h 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/common/mptPathString.h 2014-05-31 16:58:08 UTC (rev 4073)
@@ -13,6 +13,8 @@
#include <cstdio>
#include <stdio.h>
+OPENMPT_NAMESPACE_BEGIN
+
#if defined(MPT_WITH_PATHSTRING)
//#define MPT_DEPRECATED_PATH
@@ -248,3 +250,4 @@
#endif // MPT_WITH_PATHSTRING
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/common/mptString.cpp
===================================================================
--- trunk/OpenMPT/common/mptString.cpp 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/common/mptString.cpp 2014-05-31 16:58:08 UTC (rev 4073)
@@ -35,6 +35,9 @@
#endif
+OPENMPT_NAMESPACE_BEGIN
+
+
namespace mpt {
@@ -1489,3 +1492,6 @@
} // namespace mpt
+
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/common/mptString.h
===================================================================
--- trunk/OpenMPT/common/mptString.h 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/common/mptString.h 2014-05-31 16:58:08 UTC (rev 4073)
@@ -19,6 +19,9 @@
#include <cstring>
+OPENMPT_NAMESPACE_BEGIN
+
+
namespace mpt
{
@@ -1091,3 +1094,5 @@
}
} } // namespace mpt::String
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/common/mutex.h
===================================================================
--- trunk/OpenMPT/common/mutex.h 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/common/mutex.h 2014-05-31 16:58:08 UTC (rev 4073)
@@ -10,12 +10,16 @@
#pragma once
#ifdef MODPLUG_TRACKER
-
#define WIN32_LEAN_AND_MEAN
#define VC_EXTRALEAN
#define NOMINMAX
#include <windows.h>
+#endif // MODPLUG_TRACKER
+OPENMPT_NAMESPACE_BEGIN
+
+#ifdef MODPLUG_TRACKER
+
namespace Util {
// compatible with c++11 std::mutex, can eventually be replaced without touching any usage site
@@ -53,3 +57,5 @@
} // namespace Util
#endif // MODPLUG_TRACKER
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/common/serialization_utils.cpp
===================================================================
--- trunk/OpenMPT/common/serialization_utils.cpp 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/common/serialization_utils.cpp 2014-05-31 16:58:08 UTC (rev 4073)
@@ -20,6 +20,9 @@
#include "misc_util.h"
+OPENMPT_NAMESPACE_BEGIN
+
+
namespace srlztn
{
@@ -868,3 +871,5 @@
} // namespace srlztn
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/common/serialization_utils.h
===================================================================
--- trunk/OpenMPT/common/serialization_utils.h 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/common/serialization_utils.h 2014-05-31 16:58:08 UTC (rev 4073)
@@ -26,6 +26,8 @@
#include "../common/typedefs.h"
+OPENMPT_NAMESPACE_BEGIN
+
namespace srlztn //SeRiaLiZaTioN
{
@@ -600,3 +602,6 @@
} //namespace srlztn.
+
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/common/thread.h
===================================================================
--- trunk/OpenMPT/common/thread.h 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/common/thread.h 2014-05-31 16:58:08 UTC (rev 4073)
@@ -9,6 +9,8 @@
#pragma once
+OPENMPT_NAMESPACE_BEGIN
+
namespace mpt
{
@@ -67,3 +69,5 @@
#endif // !WIN32
} // namespace mpt
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/common/typedefs.cpp
===================================================================
--- trunk/OpenMPT/common/typedefs.cpp 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/common/typedefs.cpp 2014-05-31 16:58:08 UTC (rev 4073)
@@ -13,6 +13,9 @@
#include "Logging.h"
+OPENMPT_NAMESPACE_BEGIN
+
+
#if !defined(MODPLUG_TRACKER) && defined(MPT_ASSERT_HANDLER_NEEDED)
noinline void AssertHandler(const char *file, int line, const char *function, const char *expr, const char *msg)
@@ -29,3 +32,5 @@
#endif // !MODPLUG_TRACKER && MPT_ASSERT_HANDLER_NEEDED
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/common/typedefs.h
===================================================================
--- trunk/OpenMPT/common/typedefs.h 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/common/typedefs.h 2014-05-31 16:58:08 UTC (rev 4073)
@@ -12,6 +12,10 @@
+OPENMPT_NAMESPACE_BEGIN
+
+
+
#if MPT_COMPILER_MSVC
#pragma warning(error : 4309) // Treat "truncation of constant value"-warning as error.
#endif
@@ -129,13 +133,17 @@
#if defined(_MFC_VER)
typedef CMemoryException * MPTMemoryException;
#else
+OPENMPT_NAMESPACE_END
#include <new>
+OPENMPT_NAMESPACE_BEGIN
typedef std::bad_alloc & MPTMemoryException;
#endif
+OPENMPT_NAMESPACE_END
#include <memory>
+OPENMPT_NAMESPACE_BEGIN
#if MPT_COMPILER_MSVC && MPT_MSVC_BEFORE(2010,0)
#define MPT_SHARED_PTR std::tr1::shared_ptr
#else
@@ -240,7 +248,9 @@
#endif
+OPENMPT_NAMESPACE_END
#include <cstdarg>
+OPENMPT_NAMESPACE_BEGIN
#if MPT_COMPILER_MSVC
#ifndef va_copy
#define va_copy(dst, src) do { (dst) = (src); } while (0)
@@ -254,7 +264,9 @@
#if MPT_COMPILER_MSVC && MPT_MSVC_BEFORE(2010,0)
+OPENMPT_NAMESPACE_END
#include "stdint.h"
+OPENMPT_NAMESPACE_BEGIN
typedef int8_t int8;
typedef int16_t int16;
@@ -267,7 +279,9 @@
#else
+OPENMPT_NAMESPACE_END
#include <cstdint>
+OPENMPT_NAMESPACE_BEGIN
typedef std::int8_t int8;
typedef std::int16_t int16;
@@ -282,7 +296,9 @@
#ifdef ANDROID
+OPENMPT_NAMESPACE_END
#include <stdint.h>
+OPENMPT_NAMESPACE_BEGIN
// Android NDK appears to provide a different (and incomplete) <stdint.h> when compiling C++.
// Provide these macros ourselves if they are not defined by here.
@@ -453,3 +469,6 @@
#define MPT_UNREFERENCED_PARAMETER(x) (void)(x)
#endif
+
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/common/version.cpp
===================================================================
--- trunk/OpenMPT/common/version.cpp 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/common/version.cpp 2014-05-31 16:58:08 UTC (rev 4073)
@@ -17,6 +17,8 @@
#include "versionNumber.h"
#include "svn_version.h"
+OPENMPT_NAMESPACE_BEGIN
+
namespace MptVersion {
const VersionNum num = MPT_VERSION_NUMERIC;
@@ -416,3 +418,5 @@
}
} // namespace MptVersion
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/common/version.h
===================================================================
--- trunk/OpenMPT/common/version.h 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/common/version.h 2014-05-31 16:58:08 UTC (rev 4073)
@@ -13,6 +13,9 @@
#include <string>
+OPENMPT_NAMESPACE_BEGIN
+
+
//Creates version number from version parts that appears in version string.
//For example MAKE_VERSION_NUMERIC(1,17,02,28) gives version number of
//version 1.17.02.28.
@@ -91,3 +94,6 @@
std::string GetContactString();
} //namespace MptVersion
+
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/common/versionNumber.h
===================================================================
--- trunk/OpenMPT/common/versionNumber.h 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/common/versionNumber.h 2014-05-31 16:58:08 UTC (rev 4073)
@@ -10,6 +10,8 @@
#pragma once
+OPENMPT_NAMESPACE_BEGIN
+
#define VER_HELPER_STRINGIZE(x) #x
#define VER_STRINGIZE(x) VER_HELPER_STRINGIZE(x)
@@ -24,3 +26,5 @@
//Numerical value of the version.
#define MPT_VERSION_NUMERIC MAKE_VERSION_NUMERIC(VER_MAJORMAJOR,VER_MAJOR,VER_MINOR,VER_MINORMINOR)
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/include/unrar/openmpt-callback.hpp
===================================================================
--- trunk/OpenMPT/include/unrar/openmpt-callback.hpp 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/include/unrar/openmpt-callback.hpp 2014-05-31 16:58:08 UTC (rev 4073)
@@ -1,7 +1,7 @@
/*
* openmpt-callback.hpp
* --------------------
- * Purpose: Wrapper functions for FileReader, so that it can be used easily in UnRAR.
+ * Purpose: Wrapper functions for file reading.
* Notes : (currently none)
* Authors: OpenMPT Devs
* The OpenMPT source code is released under the BSD license. Read LICENSE for more details.
@@ -9,22 +9,20 @@
#pragma once
-class FileReader;
-
struct RARFileCallbacks
{
- typedef size_t (CALLBACK *RAR_READRAW) (FileReader &file, char *data, size_t size);
- typedef bool (CALLBACK *RAR_SEEK) (FileReader &file, size_t offset);
- typedef size_t (CALLBACK *RAR_GETPOSITION) (FileReader &file);
- typedef size_t (CALLBACK *RAR_GETLENGTH) (FileReader &file);
+ typedef size_t (CALLBACK *RAR_READRAW) (void *file, char *data, size_t size);
+ typedef bool (CALLBACK *RAR_SEEK) (void *file, size_t offset);
+ typedef size_t (CALLBACK *RAR_GETPOSITION) (void *file);
+ typedef size_t (CALLBACK *RAR_GETLENGTH) (void *file);
RAR_READRAW ReadRaw;
RAR_SEEK Seek;
RAR_GETPOSITION GetPosition;
RAR_GETLENGTH GetLength;
- FileReader &file;
+ void *file;
- RARFileCallbacks(RAR_READRAW readFunc, RAR_SEEK seekFunc, RAR_GETPOSITION getPosFunc, RAR_GETLENGTH getLenFunc, FileReader &f)
+ RARFileCallbacks(RAR_READRAW readFunc, RAR_SEEK seekFunc, RAR_GETPOSITION getPosFunc, RAR_GETLENGTH getLenFunc, void *f)
: ReadRaw(readFunc), Seek(seekFunc), GetPosition(getPosFunc), GetLength(getLenFunc), file(f) { }
};
Modified: trunk/OpenMPT/libopenmpt/libopenmpt_ext.cpp
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt_ext.cpp 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/libopenmpt/libopenmpt_ext.cpp 2014-05-31 16:58:08 UTC (rev 4073)
@@ -11,6 +11,8 @@
#include "soundlib/Sndfile.h"
+using namespace OpenMPT;
+
#ifndef NO_LIBOPENMPT_CXX
namespace openmpt {
Modified: trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/libopenmpt/libopenmpt_impl.cpp 2014-05-31 16:58:08 UTC (rev 4073)
@@ -29,6 +29,8 @@
#include "soundlib/AudioReadTarget.h"
#include "soundlib/FileReader.h"
+using namespace OpenMPT;
+
namespace openmpt {
namespace version {
Modified: trunk/OpenMPT/libopenmpt/libopenmpt_impl.hpp
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt_impl.hpp 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/libopenmpt/libopenmpt_impl.hpp 2014-05-31 16:58:08 UTC (rev 4073)
@@ -17,9 +17,11 @@
#include <ostream>
// forward declarations
+namespace OpenMPT {
class FileReader;
class CSoundFile;
class Dither;
+} // namespace OpenMPT
namespace openmpt {
@@ -55,8 +57,8 @@
std::shared_ptr<log_interface> m_Log;
std::unique_ptr<log_forwarder> m_LogForwarder;
double m_currentPositionSeconds;
- std::unique_ptr<CSoundFile> m_sndFile;
- std::unique_ptr<Dither> m_Dither;
+ std::unique_ptr<OpenMPT::CSoundFile> m_sndFile;
+ std::unique_ptr<OpenMPT::Dither> m_Dither;
float m_Gain;
bool m_ctl_load_skip_samples;
bool m_ctl_load_skip_patterns;
@@ -69,8 +71,8 @@
void apply_mixer_settings( std::int32_t samplerate, int channels );
void apply_libopenmpt_defaults();
void init( const std::map< std::string, std::string > & ctls );
- void load( CSoundFile & sndFile, const FileReader & file );
- void load( const FileReader & file );
+ void load( OpenMPT::CSoundFile & sndFile, const OpenMPT::FileReader & file );
+ void load( const OpenMPT::FileReader & file );
std::size_t read_wrapper( std::size_t count, std::int16_t * left, std::int16_t * right, std::int16_t * rear_left, std::int16_t * rear_right );
std::size_t read_wrapper( std::size_t count, float * left, float * right, float * rear_left, float * rear_right );
std::size_t read_interleaved_wrapper( std::size_t count, std::size_t channels, std::int16_t * interleaved );
Modified: trunk/OpenMPT/libopenmpt/libopenmpt_test.cpp
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt_test.cpp 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/libopenmpt/libopenmpt_test.cpp 2014-05-31 16:58:08 UTC (rev 4073)
@@ -19,6 +19,8 @@
#include <clocale>
+using namespace OpenMPT;
+
#if defined( LIBOPENMPT_BUILD_TEST )
#if defined(WIN32) && defined(UNICODE)
@@ -33,13 +35,13 @@
try {
// run test with "C" / classic() locale
- mpt::Test::DoTests();
+ Test::DoTests();
// try setting the C locale to the user locale
setlocale( LC_ALL, "" );
// run all tests again with a set C locale
- mpt::Test::DoTests();
+ Test::DoTests();
// try to set the C and C++ locales to the user locale
try {
@@ -50,7 +52,7 @@
}
// and now, run all tests once again
- mpt::Test::DoTests();
+ Test::DoTests();
} catch ( const std::exception & e ) {
std::cerr << "TEST ERROR: exception: " << ( e.what() ? e.what() : "" ) << std::endl;
Modified: trunk/OpenMPT/mptrack/AboutDialog.cpp
===================================================================
--- trunk/OpenMPT/mptrack/AboutDialog.cpp 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/mptrack/AboutDialog.cpp 2014-05-31 16:58:08 UTC (rev 4073)
@@ -4,6 +4,10 @@
#include "PNG.h"
#include "../common/version.h"
+
+OPENMPT_NAMESPACE_BEGIN
+
+
CRippleBitmap *CRippleBitmap::instance = nullptr;
CAboutDlg *CAboutDlg::instance = nullptr;
@@ -243,3 +247,6 @@
return TRUE; // return TRUE unless you set the focus to a control
// EXCEPTION: OCX Property Pages should return FALSE
}
+
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/mptrack/AboutDialog.h
===================================================================
--- trunk/OpenMPT/mptrack/AboutDialog.h 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/mptrack/AboutDialog.h 2014-05-31 16:58:08 UTC (rev 4073)
@@ -2,6 +2,8 @@
#include "CreditStatic.h"
+OPENMPT_NAMESPACE_BEGIN
+
namespace PNG { struct Bitmap; }
//===============================
@@ -55,4 +57,6 @@
virtual BOOL OnInitDialog();
virtual void OnOK();
virtual void OnCancel();
-};
\ No newline at end of file
+};
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/mptrack/AbstractVstEditor.cpp
===================================================================
--- trunk/OpenMPT/mptrack/AbstractVstEditor.cpp 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/mptrack/AbstractVstEditor.cpp 2014-05-31 16:58:08 UTC (rev 4073)
@@ -24,6 +24,10 @@
#include <sstream>
+
+OPENMPT_NAMESPACE_BEGIN
+
+
#ifndef NO_VST
#define PRESETS_PER_COLUMN 32
@@ -918,4 +922,7 @@
return m_nLearnMacro;
}
-#endif // NO_VST
\ No newline at end of file
+#endif // NO_VST
+
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/mptrack/AbstractVstEditor.h
===================================================================
--- trunk/OpenMPT/mptrack/AbstractVstEditor.h 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/mptrack/AbstractVstEditor.h 2014-05-31 16:58:08 UTC (rev 4073)
@@ -15,6 +15,8 @@
#include <vector>
#include "../soundlib/Snd_defs.h"
+OPENMPT_NAMESPACE_BEGIN
+
class CVstPlugin;
class CAbstractVstEditor: public CDialog
@@ -103,5 +105,6 @@
};
//end rewbs.defaultPlugGUI
+OPENMPT_NAMESPACE_END
+
#endif // NO_VST
-
Modified: trunk/OpenMPT/mptrack/AppendModule.cpp
===================================================================
--- trunk/OpenMPT/mptrack/AppendModule.cpp 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/mptrack/AppendModule.cpp 2014-05-31 16:58:08 UTC (rev 4073)
@@ -12,6 +12,9 @@
#include "Moddoc.h"
+OPENMPT_NAMESPACE_BEGIN
+
+
// Add samples, instruments, plugins and patterns from another module to the current module
void CModDoc::AppendModule(const CSoundFile &source)
//--------------------------------------------------
@@ -296,4 +299,7 @@
targetPat.WriteEffect(EffectWriter(CMD_PATTERNBREAK, 0).Row(copyRows - 1).Retry(EffectWriter::rmTryNextRow));
}
}
-}
\ No newline at end of file
+}
+
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/mptrack/AutoSaver.cpp
===================================================================
--- trunk/OpenMPT/mptrack/AutoSaver.cpp 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/mptrack/AutoSaver.cpp 2014-05-31 16:58:08 UTC (rev 4073)
@@ -21,6 +21,9 @@
#include <stdlib.h>
+OPENMPT_NAMESPACE_BEGIN
+
+
///////////////////////////////////////////////////////////////////////////////////////
// AutoSaver.cpp : implementation file
///////////////////////////////////////////////////////////////////////////////////////
@@ -473,3 +476,6 @@
return CPropertyPage::OnKillActive();
}
+
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/mptrack/AutoSaver.h
===================================================================
--- trunk/OpenMPT/mptrack/AutoSaver.h 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/mptrack/AutoSaver.h 2014-05-31 16:58:08 UTC (rev 4073)
@@ -12,6 +12,8 @@
#include "resource.h"
+OPENMPT_NAMESPACE_BEGIN
+
class CModDoc;
class CAutoSaver
@@ -98,3 +100,6 @@
BOOL OnSetActive();
};
+
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/mptrack/Autotune.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Autotune.cpp 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/mptrack/Autotune.cpp 2014-05-31 16:58:08 UTC (rev 4073)
@@ -19,6 +19,9 @@
#endif
+OPENMPT_NAMESPACE_BEGIN
+
+
// The more bins, the more autocorrelations are done and the more precise the result is.
#define BINS_PER_NOTE 32
#define MIN_SAMPLE_LENGTH 2
@@ -386,3 +389,6 @@
{
CDialog::OnCancel();
}
+
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/mptrack/Autotune.h
===================================================================
--- trunk/OpenMPT/mptrack/Autotune.h 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/mptrack/Autotune.h 2014-05-31 16:58:08 UTC (rev 4073)
@@ -13,6 +13,8 @@
#include "../soundlib/Snd_defs.h"
#include "resource.h"
+OPENMPT_NAMESPACE_BEGIN
+
//============
class Autotune
//============
@@ -79,3 +81,6 @@
virtual void DoDataExchange(CDataExchange* pDX);
};
+
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/mptrack/CImageListEx.cpp
===================================================================
--- trunk/OpenMPT/mptrack/CImageListEx.cpp 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/mptrack/CImageListEx.cpp 2014-05-31 16:58:08 UTC (rev 4073)
@@ -13,6 +13,10 @@
#include "CImageListEx.h"
#include "PNG.h"
+
+OPENMPT_NAMESPACE_BEGIN
+
+
bool CImageListEx::Create(UINT resourceID, int cx, int cy, int nInitial, int nGrow, CDC *dc, bool disabled)
{
PNG::Bitmap *bitmap = PNG::ReadPNG(MAKEINTRESOURCE(resourceID));
@@ -92,3 +96,6 @@
delete bitmap;
return true;
}
+
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/mptrack/CImageListEx.h
===================================================================
--- trunk/OpenMPT/mptrack/CImageListEx.h 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/mptrack/CImageListEx.h 2014-05-31 16:58:08 UTC (rev 4073)
@@ -10,8 +10,12 @@
#pragma once
+OPENMPT_NAMESPACE_BEGIN
+
class CImageListEx : public CImageList
{
public:
bool Create(UINT resourceID, int cx, int cy, int nInitial, int nGrow, CDC *dc, bool disabled = false);
-};
\ No newline at end of file
+};
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/mptrack/CTreeCtrl.h
===================================================================
--- trunk/OpenMPT/mptrack/CTreeCtrl.h 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/mptrack/CTreeCtrl.h 2014-05-31 16:58:08 UTC (rev 4073)
@@ -11,6 +11,9 @@
#pragma once
+OPENMPT_NAMESPACE_BEGIN
+
+
class CTreeCtrlW : public CTreeCtrl
{
public:
@@ -123,3 +126,6 @@
using CTreeCtrl::SetItemText;
using CTreeCtrl::InsertItem;
};
+
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/mptrack/ChannelManagerDlg.cpp
===================================================================
--- trunk/OpenMPT/mptrack/ChannelManagerDlg.cpp 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/mptrack/ChannelManagerDlg.cpp 2014-05-31 16:58:08 UTC (rev 4073)
@@ -15,6 +15,9 @@
#include "ChannelManagerDlg.h"
+OPENMPT_NAMESPACE_BEGIN
+
+
///////////////////////////////////////////////////////////
// CChannelManagerDlg
@@ -1175,3 +1178,6 @@
OnRButtonDown(nFlags, point);
CDialog::OnRButtonDblClk(nFlags, point);
}
+
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/mptrack/ChannelManagerDlg.h
===================================================================
--- trunk/OpenMPT/mptrack/ChannelManagerDlg.h 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/mptrack/ChannelManagerDlg.h 2014-05-31 16:58:08 UTC (rev 4073)
@@ -10,6 +10,8 @@
#pragma once
+OPENMPT_NAMESPACE_BEGIN
+
#define CM_BT_LEFT 1
#define CM_BT_RIGHT 2
#define CM_NB_COLS 8
@@ -92,3 +94,5 @@
afx_msg void OnLButtonDblClk(UINT nFlags, CPoint point);
afx_msg void OnRButtonDblClk(UINT nFlags, CPoint point);
};
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/mptrack/Childfrm.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Childfrm.cpp 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/mptrack/Childfrm.cpp 2014-05-31 16:58:08 UTC (rev 4073)
@@ -18,13 +18,16 @@
#include "view_gen.h"
#include ".\childfrm.h"
-
#ifdef _DEBUG
#define new DEBUG_NEW
#undef THIS_FILE
static char THIS_FILE[] = __FILE__;
#endif
+
+OPENMPT_NAMESPACE_BEGIN
+
+
/////////////////////////////////////////////////////////////////////////////
//
@@ -452,3 +455,5 @@
}
//end rewbs.customKeysAutoEffects
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/mptrack/Childfrm.h
===================================================================
--- trunk/OpenMPT/mptrack/Childfrm.h 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/mptrack/Childfrm.h 2014-05-31 16:58:08 UTC (rev 4073)
@@ -10,11 +10,13 @@
#pragma once
+#include "PatternCursor.h"
+
+OPENMPT_NAMESPACE_BEGIN
+
class CModControlDlg;
class CChildFrame;
-#include "PatternCursor.h"
-
typedef struct _GENERALVIEWSTATE
{
DWORD cbStruct;
@@ -152,3 +154,6 @@
//{{AFX_INSERT_LOCATION}}
// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
+
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/mptrack/CleanupSong.cpp
===================================================================
--- trunk/OpenMPT/mptrack/CleanupSong.cpp 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/mptrack/CleanupSong.cpp 2014-05-31 16:58:08 UTC (rev 4073)
@@ -16,6 +16,10 @@
#include "CleanupSong.h"
#include "../common/StringFixer.h"
+
+OPENMPT_NAMESPACE_BEGIN
+
+
// Default checkbox state
bool CModCleanupDlg::m_bCheckBoxes[CU_MAX_CLEANUP_OPTIONS] =
{
@@ -906,3 +910,6 @@
{
return modDoc.GetSoundFile()->Order.MergeSequences();
}
+
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/mptrack/CleanupSong.h
===================================================================
--- trunk/OpenMPT/mptrack/CleanupSong.h 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/mptrack/CleanupSong.h 2014-05-31 16:58:08 UTC (rev 4073)
@@ -10,6 +10,8 @@
#pragma once
+OPENMPT_NAMESPACE_BEGIN
+
//==================================
class CModCleanupDlg: public CDialog
//==================================
@@ -87,4 +89,6 @@
afx_msg void OnVerifyMutualExclusive();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
-};
\ No newline at end of file
+};
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/mptrack/CloseMainDialog.cpp
===================================================================
--- trunk/OpenMPT/mptrack/CloseMainDialog.cpp 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/mptrack/CloseMainDialog.cpp 2014-05-31 16:58:08 UTC (rev 4073)
@@ -16,6 +16,9 @@
#include "CloseMainDialog.h"
+OPENMPT_NAMESPACE_BEGIN
+
+
BEGIN_MESSAGE_MAP(CloseMainDialog, CDialog)
ON_COMMAND(IDC_BUTTON1, OnSaveAll)
ON_COMMAND(IDC_BUTTON2, OnSaveNone)
@@ -160,3 +163,6 @@
m_List.DeleteString(i);
}
}
+
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/mptrack/CloseMainDialog.h
===================================================================
--- trunk/OpenMPT/mptrack/CloseMainDialog.h 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/mptrack/CloseMainDialog.h 2014-05-31 16:58:08 UTC (rev 4073)
@@ -10,6 +10,8 @@
#pragma once
+OPENMPT_NAMESPACE_BEGIN
+
//===================================
class CloseMainDialog: public CDialog
//===================================
@@ -38,3 +40,5 @@
DECLARE_MESSAGE_MAP()
};
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/mptrack/ColourEdit.cpp
===================================================================
--- trunk/OpenMPT/mptrack/ColourEdit.cpp 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/mptrack/ColourEdit.cpp 2014-05-31 16:58:08 UTC (rev 4073)
@@ -11,6 +11,10 @@
#include "stdafx.h"
#include "colouredit.h"
+
+OPENMPT_NAMESPACE_BEGIN
+
+
/////////////////////////////////////////////////////////////////////////////
// CColourEdit
@@ -58,4 +62,7 @@
{
m_crText = rgb; //set text color ref
Invalidate(TRUE); //redraw
-}
\ No newline at end of file
+}
+
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/mptrack/ColourEdit.h
===================================================================
--- trunk/OpenMPT/mptrack/ColourEdit.h 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/mptrack/ColourEdit.h 2014-05-31 16:58:08 UTC (rev 4073)
@@ -12,6 +12,8 @@
#include "afxwin.h"
+OPENMPT_NAMESPACE_BEGIN
+
class CColourEdit :
public CEdit
{
@@ -33,3 +35,5 @@
DECLARE_MESSAGE_MAP()
};
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/mptrack/CommandSet.cpp
===================================================================
--- trunk/OpenMPT/mptrack/CommandSet.cpp 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/mptrack/CommandSet.cpp 2014-05-31 16:58:08 UTC (rev 4073)
@@ -20,6 +20,10 @@
#include <sstream>
+
+OPENMPT_NAMESPACE_BEGIN
+
+
#define ENABLE_LOGGING 0
#if(ENABLE_LOGGING)
@@ -1998,4 +2002,7 @@
return conflict;
}
-//end rewbs.customKeys
\ No newline at end of file
+//end rewbs.customKeys
+
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/mptrack/CommandSet.h
===================================================================
--- trunk/OpenMPT/mptrack/CommandSet.h 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/mptrack/CommandSet.h 2014-05-31 16:58:08 UTC (rev 4073)
@@ -11,6 +11,10 @@
#pragma once
#include <string>
#include "../common/FlagSet.h"
+#include <unordered_map>
+
+OPENMPT_NAMESPACE_BEGIN
+
struct CModSpecifications;
//#define VK_ALT 0x12
@@ -1209,7 +1213,6 @@
static bool IsExtended(UINT code);
};
-#include <unordered_map>
#if MPT_COMPILER_MSVC && MPT_MSVC_BEFORE(2010,0)
typedef std::tr1::unordered_map<KeyCombination, CommandID, KeyCombination::hash> KeyMap;
#else
@@ -1321,3 +1324,5 @@
bool LoadDefaultKeymap();
};
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/mptrack/CreditStatic.cpp
===================================================================
--- trunk/OpenMPT/mptrack/CreditStatic.cpp 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/mptrack/CreditStatic.cpp 2014-05-31 16:58:08 UTC (rev 4073)
@@ -16,6 +16,10 @@
static char THIS_FILE[] = __FILE__;
#endif
+
+OPENMPT_NAMESPACE_BEGIN
+
+
#define DISPLAY_TIMER_ID 150 // timer id
/////////////////////////////////////////////////////////////////////////////
// CCreditStatic
@@ -949,4 +953,7 @@
// Invalidate();
return TRUE;
-}
\ No newline at end of file
+}
+
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/mptrack/CreditStatic.h
===================================================================
--- trunk/OpenMPT/mptrack/CreditStatic.h 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/mptrack/CreditStatic.h 2014-05-31 16:58:08 UTC (rev 4073)
@@ -9,6 +9,8 @@
#pragma once
+OPENMPT_NAMESPACE_BEGIN
+
#define DISPLAY_SLOW 0
#define DISPLAY_MEDIUM 1
#define DISPLAY_FAST 2
@@ -118,3 +120,5 @@
//{{AFX_INSERT_LOCATION}}
// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/mptrack/Ctrl_com.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_com.cpp 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/mptrack/Ctrl_com.cpp 2014-05-31 16:58:08 UTC (rev 4073)
@@ -18,6 +18,10 @@
#include "view_com.h"
#include "InputHandler.h"
+
+OPENMPT_NAMESPACE_BEGIN
+
+
BEGIN_MESSAGE_MAP(CCtrlComments, CModControlDlg)
//{{AFX_MSG_MAP(CCtrlComments)
ON_EN_CHANGE(IDC_EDIT_COMMENTS, OnCommentsChanged)
@@ -213,3 +217,6 @@
delete[] p;
}
}
+
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/mptrack/Ctrl_com.h
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_com.h 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/mptrack/Ctrl_com.h 2014-05-31 16:58:08 UTC (rev 4073)
@@ -11,6 +11,8 @@
#pragma once
+OPENMPT_NAMESPACE_BEGIN
+
//========================================
class CCtrlComments: public CModControlDlg
//========================================
@@ -42,3 +44,5 @@
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
};
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/mptrack/Ctrl_gen.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_gen.cpp 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/mptrack/Ctrl_gen.cpp 2014-05-31 16:58:08 UTC (rev 4073)
@@ -26,6 +26,10 @@
#include "ctrl_gen.h"
// -! NEW_FEATURE#0015
+
+OPENMPT_NAMESPACE_BEGIN
+
+
BEGIN_MESSAGE_MAP(CCtrlGeneral, CModControlDlg)
//{{AFX_MSG_MAP(CCtrlGeneral)
ON_WM_VSCROLL()
@@ -685,3 +689,5 @@
m_nDisplayedVu = m_nVuMeter;
}
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/mptrack/Ctrl_gen.h
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_gen.h 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/mptrack/Ctrl_gen.h 2014-05-31 16:58:08 UTC (rev 4073)
@@ -11,6 +11,8 @@
#pragma once
+OPENMPT_NAMESPACE_BEGIN
+
//=========================
class CVuMeter: public CWnd
//=========================
@@ -99,3 +101,5 @@
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
};
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/mptrack/Ctrl_ins.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_ins.cpp 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/mptrack/Ctrl_ins.cpp 2014-05-31 16:58:08 UTC (rev 4073)
@@ -26,6 +26,10 @@
#include "MemoryMappedFile.h"
#include "FileDialog.h"
+
+OPENMPT_NAMESPACE_BEGIN
+
+
#pragma warning(disable:4244) //conversion from 'type1' to 'type2', possible loss of data
/////////////////////////////////////////////////////////////////////////
@@ -2854,3 +2858,6 @@
ModInstrument *pIns = m_sndFile.Instruments[m_nInstrument];
if ((pIns) && (pIns->nMixPlug <= MAX_MIXPLUGINS)) m_CbnMixPlug.SetCurSel(pIns->nMixPlug);
}
+
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/mptrack/Ctrl_ins.h
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_ins.h 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/mptrack/Ctrl_ins.h 2014-05-31 16:58:08 UTC (rev 4073)
@@ -11,6 +11,8 @@
#pragma once
+OPENMPT_NAMESPACE_BEGIN
+
class CNoteMapWnd;
class CCtrlInstruments;
@@ -193,3 +195,5 @@
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
};
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/mptrack/Ctrl_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_pat.cpp 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/mptrack/Ctrl_pat.cpp 2014-05-31 16:58:08 UTC (rev 4073)
@@ -24,6 +24,9 @@
#include "MIDIMacroDialog.h"
+OPENMPT_NAMESPACE_BEGIN
+
+
//////////////////////////////////////////////////////////////
// CCtrlPatterns
@@ -1266,3 +1269,5 @@
}
}
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/mptrack/Ctrl_pat.h
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_pat.h 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/mptrack/Ctrl_pat.h 2014-05-31 16:58:08 UTC (rev 4073)
@@ -14,6 +14,8 @@
#include "globals.h"
#include "PatternCursor.h"
+OPENMPT_NAMESPACE_BEGIN
+
class COrderList;
class CCtrlPatterns;
@@ -263,3 +265,5 @@
afx_msg BOOL OnMouseWheel(UINT nFlags, short zDelta, CPoint pt);
afx_msg BOOL OnToolTip(UINT id, NMHDR *pTTTStruct, LRESULT *pResult);
};
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/mptrack/Ctrl_seq.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_seq.cpp 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/mptrack/Ctrl_seq.cpp 2014-05-31 16:58:08 UTC (rev 4073)
@@ -19,6 +19,9 @@
#include "PatternClipboard.h"
+OPENMPT_NAMESPACE_BEGIN
+
+
// Little helper function to avoid copypasta
static bool IsSelectionKeyPressed() { return CMainFrame::GetInputHandler()->SelectionPressed(); }
static bool IsCtrlKeyPressed() { return CMainFrame::GetInputHandler()->CtrlPressed(); }
@@ -1446,3 +1449,6 @@
sndFile.m_lockOrderStart = sndFile.m_lockOrderEnd = ORDERINDEX_INVALID;
InvalidateRect(NULL, FALSE);
}
+
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/mptrack/Ctrl_smp.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_smp.cpp 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/mptrack/Ctrl_smp.cpp 2014-05-31 16:58:08 UTC (rev 4073)
@@ -31,15 +31,18 @@
#include "../soundlib/FileReader.h"
#include "../soundlib/SampleFormatConverters.h"
#include "FileDialog.h"
-
#ifdef _DEBUG
- #define new DEBUG_NEW
+#include <math.h>
#endif
#ifdef _DEBUG
-#include <math.h>
+#define new DEBUG_NEW
#endif
+
+OPENMPT_NAMESPACE_BEGIN
+
+
#define FLOAT_ERROR 1.0e-20f
// Float point comparison
@@ -3241,4 +3244,7 @@
}
}
}
-}
\ No newline at end of file
+}
+
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/mptrack/Ctrl_smp.h
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_smp.h 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/mptrack/Ctrl_smp.h 2014-05-31 16:58:08 UTC (rev 4073)
@@ -13,6 +13,8 @@
#include "../soundlib/SampleIO.h"
+OPENMPT_NAMESPACE_BEGIN
+
//=======================================
class CCtrlSamples: public CModControlDlg
//=======================================
@@ -133,3 +135,5 @@
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
};
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/mptrack/DefaultVstEditor.cpp
===================================================================
--- trunk/OpenMPT/mptrack/DefaultVstEditor.cpp 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/mptrack/DefaultVstEditor.cpp 2014-05-31 16:58:08 UTC (rev 4073)
@@ -13,6 +13,10 @@
#include "../soundlib/Sndfile.h"
#include "Vstplug.h"
+
+OPENMPT_NAMESPACE_BEGIN
+
+
#ifndef NO_VST
@@ -548,3 +552,6 @@
}
#endif // NO_VST
+
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/mptrack/DefaultVstEditor.h
===================================================================
--- trunk/OpenMPT/mptrack/DefaultVstEditor.h 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/mptrack/DefaultVstEditor.h 2014-05-31 16:58:08 UTC (rev 4073)
@@ -10,17 +10,19 @@
#pragma once
+#ifndef NO_VST
+
+#include "mptrack.h"
+#include "AbstractVstEditor.h"
+
+OPENMPT_NAMESPACE_BEGIN
+
enum
{
PARAM_RESOLUTION = 1000,
NUM_PLUGINEDITOR_PARAMETERS = 8, // Parameters on screen
};
-#ifndef NO_VST
-
-#include "mptrack.h"
-#include "AbstractVstEditor.h"
-
//===================
class ParamControlSet
//===================
@@ -101,5 +103,6 @@
};
+OPENMPT_NAMESPACE_END
+
#endif // NO_VST
-
Modified: trunk/OpenMPT/mptrack/Draw_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Draw_pat.cpp 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/mptrack/Draw_pat.cpp 2014-05-31 16:58:08 UTC (rev 4073)
@@ -23,6 +23,10 @@
#include "EffectInfo.h"
#include <string>
+
+OPENMPT_NAMESPACE_BEGIN
+
+
// Headers
#define ROWHDR_WIDTH 32 // Row header
#define COLHDR_HEIGHT 16 // Column header
@@ -1763,3 +1767,5 @@
::ReleaseDC(m_hWnd, hdc);
}
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/mptrack/EffectInfo.cpp
===================================================================
--- trunk/OpenMPT/mptrack/EffectInfo.cpp 2014-05-31 12:42:46 UTC (rev 4072)
+++ trunk/OpenMPT/mptrack/EffectInfo.cpp 2014-05-31 16:58:08 UTC (rev 4073)
@@ -14,6 +14,10 @@
#include "../soundlib/Sndfile.h"
#include "../soundlib/Tables.h"
+
+OPENMPT_NAMESPACE_BEGIN
+
+
///////////////////////////////////////////////////////////////////////////
// Effects description
@@ -958,3 +962,6 @@
}
return (gVolCmdInfo[ndx].supportedFormats & sndFile.GetType()) != 0;
}
+
+
+OPENMPT_NAMESPACE_END
Modified: trunk/OpenMPT/mptrack/Effect...
[truncated message content] |
