Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[1194] trunk/OpenMPT
|
From: <sag...@us...> - 2012-02-25 20:51:42
|
Revision: 1194
http://modplug.svn.sourceforge.net/modplug/?rev=1194&view=rev
Author: saga-games
Date: 2012-02-25 20:51:28 +0000 (Sat, 25 Feb 2012)
Log Message:
-----------
Mega refactoring commit!
[Ref] Renamed MODSAMPLE to ModSample, MODINSTRUMENT to ModInstrument, MODCHANNEL to ModChannel, MODCHANNEL_ENVINFO to ModChannelEnvInfo, MODCHANNELSETTINGS to ModChannelSettings and moved them to seprate files.
[Ref] Since quite a few files had to be updated, I decided to also update the file headers while I was at it. They should all include proper copyright information now.
[Ref] Also changed all the #include guards to #pragma once while I was at it...
[Ref] Changed #pragma pack(1) to #pragma pack(push, 1) etc. everywhere.
[Ref] Removed some files that have never been used.
Modified Paths:
--------------
trunk/OpenMPT/README
trunk/OpenMPT/common/Reporting.cpp
trunk/OpenMPT/common/Reporting.h
trunk/OpenMPT/common/StringFixer.h
trunk/OpenMPT/common/misc_util.cpp
trunk/OpenMPT/common/misc_util.h
trunk/OpenMPT/common/typedefs.h
trunk/OpenMPT/mptrack/ACMConvert.cpp
trunk/OpenMPT/mptrack/ACMConvert.h
trunk/OpenMPT/mptrack/AbstractVstEditor.cpp
trunk/OpenMPT/mptrack/AbstractVstEditor.h
trunk/OpenMPT/mptrack/ArrayUtils.cpp
trunk/OpenMPT/mptrack/ArrayUtils.h
trunk/OpenMPT/mptrack/AutoSaver.cpp
trunk/OpenMPT/mptrack/AutoSaver.h
trunk/OpenMPT/mptrack/Autotune.cpp
trunk/OpenMPT/mptrack/Autotune.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/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/MIDIMappingDialog.cpp
trunk/OpenMPT/mptrack/MIDIMappingDialog.h
trunk/OpenMPT/mptrack/MPTHacks.cpp
trunk/OpenMPT/mptrack/MainFrm.cpp
trunk/OpenMPT/mptrack/Mainbar.cpp
trunk/OpenMPT/mptrack/Mainbar.h
trunk/OpenMPT/mptrack/Mainfrm.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/PSRatioCalc.cpp
trunk/OpenMPT/mptrack/PSRatioCalc.h
trunk/OpenMPT/mptrack/PatternEditorDialogs.cpp
trunk/OpenMPT/mptrack/PatternEditorDialogs.h
trunk/OpenMPT/mptrack/PatternGotoDialog.cpp
trunk/OpenMPT/mptrack/PatternGotoDialog.h
trunk/OpenMPT/mptrack/STDAFX.CPP
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/SoundFilePlayConfig.cpp
trunk/OpenMPT/mptrack/SoundFilePlayConfig.h
trunk/OpenMPT/mptrack/Stdafx.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/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/mptrack.vcproj
trunk/OpenMPT/mptrack/mptrack_08.vcproj
trunk/OpenMPT/mptrack/mptrack_10.vcxproj
trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters
trunk/OpenMPT/mptrack/resource.h
trunk/OpenMPT/mptrack/serialization_utils.cpp
trunk/OpenMPT/mptrack/serialization_utils.h
trunk/OpenMPT/mptrack/tagging.cpp
trunk/OpenMPT/mptrack/tagging.h
trunk/OpenMPT/mptrack/test/test.cpp
trunk/OpenMPT/mptrack/test/test.h
trunk/OpenMPT/mptrack/tuningRatioMapWnd.cpp
trunk/OpenMPT/mptrack/tuningRatioMapWnd.h
trunk/OpenMPT/mptrack/version.h
trunk/OpenMPT/mptrack/view_com.cpp
trunk/OpenMPT/mptrack/view_com.h
trunk/OpenMPT/soundlib/Dlsbank.cpp
trunk/OpenMPT/soundlib/Dlsbank.h
trunk/OpenMPT/soundlib/Endianness.h
trunk/OpenMPT/soundlib/Fastmix.cpp
trunk/OpenMPT/soundlib/IT_DEFS.H
trunk/OpenMPT/soundlib/LOAD_AMF.CPP
trunk/OpenMPT/soundlib/LOAD_DBM.CPP
trunk/OpenMPT/soundlib/LOAD_DMF.CPP
trunk/OpenMPT/soundlib/LOAD_DSM.CPP
trunk/OpenMPT/soundlib/Load_669.cpp
trunk/OpenMPT/soundlib/Load_ams.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/MIDIMacros.cpp
trunk/OpenMPT/soundlib/MIDIMacros.h
trunk/OpenMPT/soundlib/Message.cpp
trunk/OpenMPT/soundlib/Mmcmp.cpp
trunk/OpenMPT/soundlib/Mmx_mix.cpp
trunk/OpenMPT/soundlib/ModSequence.cpp
trunk/OpenMPT/soundlib/ModSequence.h
trunk/OpenMPT/soundlib/PlaybackEventer.cpp
trunk/OpenMPT/soundlib/PlaybackEventer.h
trunk/OpenMPT/soundlib/PlugInterface.h
trunk/OpenMPT/soundlib/PluginMixBuffer.h
trunk/OpenMPT/soundlib/SNDDEV.H
trunk/OpenMPT/soundlib/SNDDEVX.H
trunk/OpenMPT/soundlib/Sampleio.cpp
trunk/OpenMPT/soundlib/Snd_defs.h
trunk/OpenMPT/soundlib/Snd_dsp.cpp
trunk/OpenMPT/soundlib/Snd_eq.cpp
trunk/OpenMPT/soundlib/Snd_flt.cpp
trunk/OpenMPT/soundlib/Snd_fx.cpp
trunk/OpenMPT/soundlib/Snd_rvb.cpp
trunk/OpenMPT/soundlib/Snddev.cpp
trunk/OpenMPT/soundlib/Sndfile.cpp
trunk/OpenMPT/soundlib/Sndfile.h
trunk/OpenMPT/soundlib/Sndmix.cpp
trunk/OpenMPT/soundlib/Tables.cpp
trunk/OpenMPT/soundlib/Wav.h
trunk/OpenMPT/soundlib/Waveform.cpp
trunk/OpenMPT/soundlib/WindowedFIR.cpp
trunk/OpenMPT/soundlib/WindowedFIR.h
trunk/OpenMPT/soundlib/load_j2b.cpp
trunk/OpenMPT/soundlib/midi.h
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/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/soundlib/wavConverter.h
trunk/OpenMPT/ungzip/ungzip.cpp
trunk/OpenMPT/ungzip/ungzip.h
Added Paths:
-----------
trunk/OpenMPT/LICENSE
trunk/OpenMPT/soundlib/ModChannel.h
trunk/OpenMPT/soundlib/ModInstrument.cpp
trunk/OpenMPT/soundlib/ModInstrument.h
trunk/OpenMPT/soundlib/ModSample.h
Removed Paths:
-------------
trunk/OpenMPT/gpl.txt
trunk/OpenMPT/modplug.htm
trunk/OpenMPT/mptrack/KeyboardSettings.cpp
trunk/OpenMPT/mptrack/KeyboardSettings.h
trunk/OpenMPT/mptrack/OpenGLControl.cpp
trunk/OpenMPT/mptrack/OpenGLControl.h
trunk/OpenMPT/mptrack/OpenGLDevice.cpp
trunk/OpenMPT/mptrack/OpenGLDevice.h
trunk/OpenMPT/mptrack/OpenGLEditor.cpp
trunk/OpenMPT/mptrack/OpenGLEditor.h
trunk/OpenMPT/mptrack/PerformanceCounter.cpp
trunk/OpenMPT/mptrack/PerformanceCounter.h
trunk/OpenMPT/readme.txt
Added: trunk/OpenMPT/LICENSE
===================================================================
--- trunk/OpenMPT/LICENSE (rev 0)
+++ trunk/OpenMPT/LICENSE 2012-02-25 20:51:28 UTC (rev 1194)
@@ -0,0 +1,27 @@
+The OpenMPT code is licensed under the BSD license.
+
+Copyright (c) 2004-2012, OpenMPT contributors
+Copyright (c) 1997-2003, Olivier Lapicque
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ * Neither the name of the OpenMPT project nor the
+ names of its contributors may be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS ``AS IS'' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
Modified: trunk/OpenMPT/README
===================================================================
--- trunk/OpenMPT/README 2012-02-24 23:19:27 UTC (rev 1193)
+++ trunk/OpenMPT/README 2012-02-25 20:51:28 UTC (rev 1194)
@@ -46,3 +46,30 @@
}
}
+
+
+A few words from the readme of the original MPT 1.16 source drop by Olivier:
+
+The sound library was originally written to support VOC/WAV and MOD files under
+DOS, and supported such things as PC-Speaker, SoundBlaster 1/2/Pro, and the
+famous Gravis UltraSound.
+It was then ported to Win32 in 1995 (through the Mod95 project, mostly for use
+within Render32).
+What does this mean?
+It means the code base is quite old and is showing its age (over 10 years now)
+It means that many things are poorly named (CSoundFile), and not very clean, and
+if I was to rewrite the engine today, it would look much different.
+
+Some tips for future development and cleanup:
+- Probably the main improvement would be to separate the Song, Channel, Mixer
+and Low-level mixing routines in separate interface-based classes.
+- Get rid of globals (many globals creeped up over time, mostly because of the
+hack to allow simultaneous playback of 2 songs in Modplug Player -> ReadMix()).
+This is a major problem for writing a DShow source filter, or any other COM
+object (A DShow source would allow playback of MOD files in WMP, which would be much easier than
+rewriting a different player).
+- The MPT UI code is MFC-based, and I would say is fairly clean (as a rough
+rule, the more recent the code is, the cleaner it is), though the UI code is
+tightly integrated with the implementation (this could make it somewhat more
+difficult to implement such things as a skin-based UI - but hey, if it was easy,
+I probably would have done it already :).
\ No newline at end of file
Modified: trunk/OpenMPT/common/Reporting.cpp
===================================================================
--- trunk/OpenMPT/common/Reporting.cpp 2012-02-24 23:19:27 UTC (rev 1193)
+++ trunk/OpenMPT/common/Reporting.cpp 2012-02-25 20:51:28 UTC (rev 1194)
@@ -1,10 +1,10 @@
/*
- *
* Reporting.cpp
* -------------
* Purpose: A class for showing notifications, prompts, etc...
* Notes : (currently none)
* Authors: OpenMPT Devs
+ * The OpenMPT source code is released under the BSD license. Read LICENSE for more details.
*/
Modified: trunk/OpenMPT/common/Reporting.h
===================================================================
--- trunk/OpenMPT/common/Reporting.h 2012-02-24 23:19:27 UTC (rev 1193)
+++ trunk/OpenMPT/common/Reporting.h 2012-02-25 20:51:28 UTC (rev 1194)
@@ -1,16 +1,14 @@
/*
- *
* Reporting.h
* -----------
- * Purpose: Header file for reporting class.
+ * Purpose: A class for showing notifications, prompts, etc...
* Notes : (currently none)
* Authors: OpenMPT Devs
+ * The OpenMPT source code is released under the BSD license. Read LICENSE for more details.
*/
#pragma once
-#ifndef REPORTING_H
-#define REPORTING_H
enum ConfirmAnswer
{
@@ -66,5 +64,3 @@
static RetryAnswer RetryCancel(const char *text, const char *caption, const CWnd *parent = nullptr);
};
-
-#endif // REPORTING_H
Modified: trunk/OpenMPT/common/StringFixer.h
===================================================================
--- trunk/OpenMPT/common/StringFixer.h 2012-02-24 23:19:27 UTC (rev 1193)
+++ trunk/OpenMPT/common/StringFixer.h 2012-02-25 20:51:28 UTC (rev 1194)
@@ -5,14 +5,12 @@
* reading from module files, or for securing char arrays in general.
* Notes : (currently none)
* Authors: OpenMPT Devs
+ * The OpenMPT source code is released under the BSD license. Read LICENSE for more details.
*/
-#ifndef STRINGFIXER_H
-#define STRINGFIXER_H
#pragma once
-
namespace StringFixer
{
@@ -23,7 +21,7 @@
//------------------------------------------
{
STATIC_ASSERT(size > 0);
- buffer[size-1] = 0;
+ buffer[size - 1] = 0;
}
@@ -120,5 +118,3 @@
}
};
-
-#endif // STRINGFIXER_H
Modified: trunk/OpenMPT/common/misc_util.cpp
===================================================================
--- trunk/OpenMPT/common/misc_util.cpp 2012-02-24 23:19:27 UTC (rev 1193)
+++ trunk/OpenMPT/common/misc_util.cpp 2012-02-25 20:51:28 UTC (rev 1194)
@@ -1,3 +1,13 @@
+/*
+ * misc_util.cpp
+ * -------------
+ * Purpose: Various useful utility functions.
+ * Notes : (currently none)
+ * Authors: OpenMPT Devs
+ * The OpenMPT source code is released under the BSD license. Read LICENSE for more details.
+ */
+
+
#include "stdafx.h"
#include "misc_util.h"
#include <ctime>
Modified: trunk/OpenMPT/common/misc_util.h
===================================================================
--- trunk/OpenMPT/common/misc_util.h 2012-02-24 23:19:27 UTC (rev 1193)
+++ trunk/OpenMPT/common/misc_util.h 2012-02-25 20:51:28 UTC (rev 1194)
@@ -1,5 +1,13 @@
-#ifndef MISC_UTIL_H
-#define MISC_UTIL_H
+/*
+ * misc_util.h
+ * -----------
+ * Purpose: Various useful utility functions.
+ * Notes : (currently none)
+ * Authors: OpenMPT Devs
+ * The OpenMPT source code is released under the BSD license. Read LICENSE for more details.
+ */
+
+
#pragma once
#include <sstream>
@@ -320,5 +328,3 @@
inline bool IsPathFileAvailable(LPCTSTR pszFilePath, FileMode fm) {return (_taccess(pszFilePath, fm) == 0);}
} } // namespace Util::sdOs
-
-#endif
Modified: trunk/OpenMPT/common/typedefs.h
===================================================================
--- trunk/OpenMPT/common/typedefs.h 2012-02-24 23:19:27 UTC (rev 1193)
+++ trunk/OpenMPT/common/typedefs.h 2012-02-25 20:51:28 UTC (rev 1194)
@@ -1,7 +1,18 @@
-#ifndef TYPEDEFS_H
-#define TYPEDEFS_H
+/*
+ * typedefs.h
+ * ----------
+ * Purpose: Basic data type definitions.
+ * Notes : (currently none)
+ * Authors: OpenMPT Devs
+ * The OpenMPT source code is released under the BSD license. Read LICENSE for more details.
+ */
+
+#pragma once
+
+#ifndef nullptr
#define nullptr 0
+#endif
// CountOf macro computes the number of elements in a statically-allocated array.
#if _MSC_VER >= 1400
@@ -63,6 +74,3 @@
};
};
#endif
-
-
-#endif
Deleted: trunk/OpenMPT/gpl.txt
===================================================================
--- trunk/OpenMPT/gpl.txt 2012-02-24 23:19:27 UTC (rev 1193)
+++ trunk/OpenMPT/gpl.txt 2012-02-25 20:51:28 UTC (rev 1194)
@@ -1,342 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
-
-
Deleted: trunk/OpenMPT/modplug.htm
===================================================================
--- trunk/OpenMPT/modplug.htm 2012-02-24 23:19:27 UTC (rev 1193)
+++ trunk/OpenMPT/modplug.htm 2012-02-25 20:51:28 UTC (rev 1194)
@@ -1 +0,0 @@
-<META HTTP-EQUIV="Refresh" CONTENT="0; URL=http://www.modplug.com/index.shtml">
\ No newline at end of file
Modified: trunk/OpenMPT/mptrack/ACMConvert.cpp
===================================================================
--- trunk/OpenMPT/mptrack/ACMConvert.cpp 2012-02-24 23:19:27 UTC (rev 1193)
+++ trunk/OpenMPT/mptrack/ACMConvert.cpp 2012-02-25 20:51:28 UTC (rev 1194)
@@ -1,12 +1,11 @@
/*
- *
* ACMConvert.cpp
* --------------
- * Purpose: MPEG Layer-3 Functions through ACM - access to LAMEenc and BLADEenc is emulated through the ACM interface
- * Notes : (currently none)
+ * Purpose: MPEG Layer-3 Functions through ACM.
+ * Notes : Access to LAMEenc and BLADEenc is emulated through the ACM interface.
* Authors: Olivier Lapicque
* OpenMPT Devs
- *
+ * The OpenMPT source code is released under the BSD license. Read LICENSE for more details.
*/
Modified: trunk/OpenMPT/mptrack/ACMConvert.h
===================================================================
--- trunk/OpenMPT/mptrack/ACMConvert.h 2012-02-24 23:19:27 UTC (rev 1193)
+++ trunk/OpenMPT/mptrack/ACMConvert.h 2012-02-25 20:51:28 UTC (rev 1194)
@@ -1,18 +1,15 @@
/*
- *
* ACMConvert.h
* ------------
- * Purpose: Header for ACM and MPEG Layer-3 conversion
- * Notes : (currently none)
+ * Purpose: MPEG Layer-3 Functions through ACM.
+ * Notes : Access to LAMEenc and BLADEenc is emulated through the ACM interface.
* Authors: Olivier Lapicque
* OpenMPT Devs
- *
+ * The OpenMPT source code is released under the BSD license. Read LICENSE for more details.
*/
#pragma once
-#ifndef ACMCONVERT_H
-#define ACMCONVERT_H
/////////////////////////////////////////////////////////////////////////////
// ACM Functions (for dynamic linking)
@@ -65,5 +62,3 @@
static BOOL CALLBACK AcmFormatEnumCB(HACMDRIVERID, LPACMFORMATDETAILS, DWORD, DWORD);
};
-
-#endif // ACMCONVERT_H
Modified: trunk/OpenMPT/mptrack/AbstractVstEditor.cpp
===================================================================
--- trunk/OpenMPT/mptrack/AbstractVstEditor.cpp 2012-02-24 23:19:27 UTC (rev 1193)
+++ trunk/OpenMPT/mptrack/AbstractVstEditor.cpp 2012-02-25 20:51:28 UTC (rev 1194)
@@ -1,5 +1,13 @@
-//rewbs.defaultPlugGUI
+/*
+ * AbstractVstEditor.cpp
+ * ---------------------
+ * Purpose: Common plugin editor interface class. This code is shared between custom and default plugin user interfaces.
+ * Notes : (currently none)
+ * Authors: OpenMPT Devs
+ * The OpenMPT source code is released under the BSD license. Read LICENSE for more details.
+ */
+
#include "stdafx.h"
#include "mptrack.h"
#include "moddoc.h"
@@ -761,7 +769,7 @@
return false;
}
- MODINSTRUMENT *pIns = pSndFile->Instruments[nIns];
+ ModInstrument *pIns = pSndFile->Instruments[nIns];
m_nInstrument = nIns;
_snprintf(pIns->name, CountOf(pIns->name) - 1, _T("%d: %s"), m_pVstPlugin->GetSlot() + 1, pSndFile->m_MixPlugins[m_pVstPlugin->GetSlot()].Info.szName);
Modified: trunk/OpenMPT/mptrack/AbstractVstEditor.h
===================================================================
--- trunk/OpenMPT/mptrack/AbstractVstEditor.h 2012-02-24 23:19:27 UTC (rev 1193)
+++ trunk/OpenMPT/mptrack/AbstractVstEditor.h 2012-02-25 20:51:28 UTC (rev 1194)
@@ -1,4 +1,13 @@
-//rewbs.defaultPlugGUI
+/*
+ * AbstractVstEditor.h
+ * -------------------
+ * Purpose: Common plugin editor interface class. This code is shared between custom and default plugin user interfaces.
+ * Notes : (currently none)
+ * Authors: OpenMPT Devs
+ * The OpenMPT source code is released under the BSD license. Read LICENSE for more details.
+ */
+
+
#pragma once
#ifndef NO_VST
Modified: trunk/OpenMPT/mptrack/ArrayUtils.cpp
===================================================================
--- trunk/OpenMPT/mptrack/ArrayUtils.cpp 2012-02-24 23:19:27 UTC (rev 1193)
+++ trunk/OpenMPT/mptrack/ArrayUtils.cpp 2012-02-25 20:51:28 UTC (rev 1194)
@@ -1,6 +1,16 @@
+/*
+ * ArrayUtils.cpp
+ * --------------
+ * Purpose: Some tools for handling CArrays.
+ * Notes : (currently none)
+ * Authors: OpenMPT Devs
+ * The OpenMPT source code is released under the BSD license. Read LICENSE for more details.
+ */
+
+
#include "stdafx.h"
#include "afxtempl.h"
-#include ".\arrayutils.h"
+#include "arrayutils.h"
template <class Type>
static void CArrayUtils<Type>::Merge(CArray<Type,Type>& Dest, CArray<Type,Type>& Src)
Modified: trunk/OpenMPT/mptrack/ArrayUtils.h
===================================================================
--- trunk/OpenMPT/mptrack/ArrayUtils.h 2012-02-24 23:19:27 UTC (rev 1193)
+++ trunk/OpenMPT/mptrack/ArrayUtils.h 2012-02-25 20:51:28 UTC (rev 1194)
@@ -1,3 +1,13 @@
+/*
+ * ArrayUtils.h
+ * ------------
+ * Purpose: Some tools for handling CArrays.
+ * Notes : (currently none)
+ * Authors: OpenMPT Devs
+ * The OpenMPT source code is released under the BSD license. Read LICENSE for more details.
+ */
+
+
#pragma once
template <class Type>
Modified: trunk/OpenMPT/mptrack/AutoSaver.cpp
===================================================================
--- trunk/OpenMPT/mptrack/AutoSaver.cpp 2012-02-24 23:19:27 UTC (rev 1193)
+++ trunk/OpenMPT/mptrack/AutoSaver.cpp 2012-02-25 20:51:28 UTC (rev 1194)
@@ -1,5 +1,15 @@
+/*
+ * AutoSaver.cpp
+ * -------------
+ * Purpose: Class for automatically saving open modules at a specified interval.
+ * Notes : (currently none)
+ * Authors: OpenMPT Devs
+ * The OpenMPT source code is released under the BSD license. Read LICENSE for more details.
+ */
+
+
#include "stdafx.h"
-#include ".\autosaver.h"
+#include "autosaver.h"
#include "stdafx.h"
#include "mptrack.h"
#include "mainfrm.h"
Modified: trunk/OpenMPT/mptrack/AutoSaver.h
===================================================================
--- trunk/OpenMPT/mptrack/AutoSaver.h 2012-02-24 23:19:27 UTC (rev 1193)
+++ trunk/OpenMPT/mptrack/AutoSaver.h 2012-02-25 20:51:28 UTC (rev 1194)
@@ -1,3 +1,13 @@
+/*
+ * AutoSaver.h
+ * -----------
+ * Purpose: Class for automatically saving open modules at a specified interval.
+ * Notes : (currently none)
+ * Authors: OpenMPT Devs
+ * The OpenMPT source code is released under the BSD license. Read LICENSE for more details.
+ */
+
+
#pragma once
#include "resource.h"
Modified: trunk/OpenMPT/mptrack/Autotune.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Autotune.cpp 2012-02-24 23:19:27 UTC (rev 1193)
+++ trunk/OpenMPT/mptrack/Autotune.cpp 2012-02-25 20:51:28 UTC (rev 1194)
@@ -1,9 +1,10 @@
/*
* Autotune.cpp
- * -------------
- * Purpose: Class for tuning a sample to the next C automatically.
+ * ------------
+ * Purpose: Class for tuning a sample to a given base note automatically.
* Notes : (currently none)
* Authors: OpenMPT Devs
+ * The OpenMPT source code is released under the BSD license. Read LICENSE for more details.
*/
Modified: trunk/OpenMPT/mptrack/Autotune.h
===================================================================
--- trunk/OpenMPT/mptrack/Autotune.h 2012-02-24 23:19:27 UTC (rev 1193)
+++ trunk/OpenMPT/mptrack/Autotune.h 2012-02-25 20:51:28 UTC (rev 1194)
@@ -1,15 +1,14 @@
/*
* Autotune.h
* ----------
- * Purpose: Header file for sample auto tuning
+ * Purpose: Class for tuning a sample to a given base note automatically.
* Notes : (currently none)
* Authors: OpenMPT Devs
+ * The OpenMPT source code is released under the BSD license. Read LICENSE for more details.
*/
#pragma once
-#ifndef AUTOTUNE_H
-#define AUTOTUNE_H
#include "../soundlib/Snd_defs.h"
#include "resource.h"
@@ -19,7 +18,7 @@
//============
{
protected:
- MODSAMPLE &sample;
+ ModSample &sample;
MODTYPE modType;
SmpLength selectionStart, selectionEnd;
@@ -28,7 +27,7 @@
SmpLength sampleLength;
public:
- Autotune(MODSAMPLE &smp, MODTYPE type, SmpLength selStart, SmpLength selEnd) : sample(smp), modType(type), selectionStart(selStart), selectionEnd(selEnd)
+ Autotune(ModSample &smp, MODTYPE type, SmpLength selStart, SmpLength selEnd) : sample(smp), modType(type), selectionStart(selStart), selectionEnd(selEnd)
{
sampleData = nullptr;
sampleLength = 0;
@@ -79,5 +78,3 @@
virtual void DoDataExchange(CDataExchange* pDX);
};
-
-#endif // AUTOTUNE_H
Modified: trunk/OpenMPT/mptrack/ChannelManagerDlg.cpp
===================================================================
--- trunk/OpenMPT/mptrack/ChannelManagerDlg.cpp 2012-02-24 23:19:27 UTC (rev 1193)
+++ trunk/OpenMPT/mptrack/ChannelManagerDlg.cpp 2012-02-25 20:51:28 UTC (rev 1194)
@@ -1,3 +1,13 @@
+/*
+ * ChannelManagerDlg.cpp
+ * ---------------------
+ * Purpose: Dialog class for moving, removing, managing channels
+ * Notes : (currently none)
+ * Authors: OpenMPT Devs
+ * The OpenMPT source code is released under the BSD license. Read LICENSE for more details.
+ */
+
+
#include "stdafx.h"
#include "mainfrm.h"
#include "moddoc.h"
Modified: trunk/OpenMPT/mptrack/ChannelManagerDlg.h
===================================================================
--- trunk/OpenMPT/mptrack/ChannelManagerDlg.h 2012-02-24 23:19:27 UTC (rev 1193)
+++ trunk/OpenMPT/mptrack/ChannelManagerDlg.h 2012-02-25 20:51:28 UTC (rev 1194)
@@ -1,3 +1,13 @@
+/*
+ * ChannelManagerDlg.h
+ * -------------------
+ * Purpose: Dialog class for moving, removing, managing channels
+ * Notes : (currently none)
+ * Authors: OpenMPT Devs
+ * The OpenMPT source code is released under the BSD license. Read LICENSE for more details.
+ */
+
+
#pragma once
#define CM_BT_LEFT 1
@@ -83,6 +93,3 @@
afx_msg void OnLButtonDblClk(UINT nFlags, CPoint point);
afx_msg void OnRButtonDblClk(UINT nFlags, CPoint point);
};
-
-// -! NEW_FEATURE#0015
-
Modified: trunk/OpenMPT/mptrack/Childfrm.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Childfrm.cpp 2012-02-24 23:19:27 UTC (rev 1193)
+++ trunk/OpenMPT/mptrack/Childfrm.cpp 2012-02-25 20:51:28 UTC (rev 1194)
@@ -1,6 +1,13 @@
-// ChildFrm.cpp : implementation of the CChildFrame class
-//
+/*
+ * ChildFrm.cpp
+ * ------------
+ * Purpose: Implementation of tab interface class.
+ * Notes : (currently none)
+ * Authors: OpenMPT Devs
+ * The OpenMPT source code is released under the BSD license. Read LICENSE for more details.
+ */
+
#include "stdafx.h"
#include <afxpriv.h>
#include "mptrack.h"
Modified: trunk/OpenMPT/mptrack/Childfrm.h
===================================================================
--- trunk/OpenMPT/mptrack/Childfrm.h 2012-02-24 23:19:27 UTC (rev 1193)
+++ trunk/OpenMPT/mptrack/Childfrm.h 2012-02-25 20:51:28 UTC (rev 1194)
@@ -1,12 +1,15 @@
-// ChildFrm.h : interface of the CChildFrame class
-//
-/////////////////////////////////////////////////////////////////////////////
+/*
+ * ChildFrm.h
+ * ----------
+ * Purpose: Implementation of tab interface class.
+ * Notes : (currently none)
+ * Authors: OpenMPT Devs
+ * The OpenMPT source code is released under the BSD license. Read LICENSE for more details.
+ */
+
#pragma once
-#ifndef CHILDFRM_H
-#define CHILDFRM_H
-
class CModControlDlg;
class CChildFrame;
@@ -151,5 +154,3 @@
//{{AFX_INSERT_LOCATION}}
// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // CHILDFRM_H
Modified: trunk/OpenMPT/mptrack/CleanupSong.cpp
===================================================================
--- trunk/OpenMPT/mptrack/CleanupSong.cpp 2012-02-24 23:19:27 UTC (rev 1193)
+++ trunk/OpenMPT/mptrack/CleanupSong.cpp 2012-02-25 20:51:28 UTC (rev 1194)
@@ -1,14 +1,14 @@
/*
- *
* CleanupSong.cpp
* ---------------
- * Purpose: Interface for cleaning up modules (rearranging, removing unused items)
- *
+ * Purpose: Dialog for cleaning up modules (rearranging, removing unused items).
+ * Notes : (currently none)
* Authors: Olivier Lapicque
* OpenMPT Devs
- *
+ * The OpenMPT source code is released under the BSD license. Read LICENSE for more details.
*/
+
#include "stdafx.h"
#include "moddoc.h"
#include "Mainfrm.h"
@@ -345,7 +345,7 @@
bool isPatUsed; // Is pattern used in sequence?
PATTERNINDEX newIndex; // map old pattern index <-> new pattern index
// This stuff is needed for copying the old pattern properties to the new pattern number
- MODCOMMAND *data; // original pattern data
+ ModCommand *data; // original pattern data
ROWINDEX numRows; // original pattern sizes
ROWINDEX rowsPerBeat; // original pattern highlight
ROWINDEX rowsPerMeasure; // original pattern highlight
@@ -574,7 +574,7 @@
for (SAMPLEINDEX nSmp = 1; nSmp <= pSndFile->GetNumSamples(); nSmp++)
{
- const MODSAMPLE &sample = pSndFile->GetSample(nSmp);
+ const ModSample &sample = pSndFile->GetSample(nSmp);
// Determine how much of the sample will be played
UINT loopLength = sample.nLength;
@@ -598,7 +598,7 @@
{
for (SAMPLEINDEX nSmp = 1; nSmp <= pSndFile->m_nSamples; nSmp++)
{
- MODSAMPLE &sample = pSndFile->GetSample(nSmp);
+ ModSample &sample = pSndFile->GetSample(nSmp);
// Determine how much of the sample will be played
UINT loopLength = sample.nLength;
@@ -679,7 +679,7 @@
// Also update instrument mapping (if module is in instrument mode)
for(INSTRUMENTINDEX nIns = 1; nIns <= pSndFile->GetNumInstruments(); nIns++)
{
- MODINSTRUMENT *pIns = pSndFile->Instruments[nIns];
+ ModInstrument *pIns = pSndFile->Instruments[nIns];
if(pIns)
{
for(size_t iNote = 0; iNote < 128; iNote++)
@@ -694,7 +694,7 @@
{
for (PATTERNINDEX nPat = 0; nPat < pSndFile->Patterns.Size(); nPat++) if (pSndFile->Patterns[nPat])
{
- MODCOMMAND *m = pSndFile->Patterns[nPat];
+ ModCommand *m = pSndFile->Patterns[nPat];
for(UINT len = pSndFile->Patterns[nPat].GetNumRows() * pSndFile->GetNumChannels(); len; m++, len--)
{
if(!m->IsPcNote() && m->instr <= pSndFile->GetNumSamples()) m->instr = (BYTE)nSampleMap[m->instr];
@@ -796,7 +796,7 @@
{
for (PATTERNINDEX iPat = 0; iPat < pSndFile->Patterns.Size(); iPat++) if (pSndFile->Patterns[iPat])
{
- MODCOMMAND *p = pSndFile->Patterns[iPat];
+ ModCommand *p = pSndFile->Patterns[iPat];
UINT nLen = pSndFile->m_nChannels * pSndFile->Patterns[iPat].GetNumRows();
while (nLen--)
{
@@ -804,7 +804,7 @@
{
for (UINT k=0; k<nSwap; k++)
{
- if (p->instr == swapmap[k]) p->instr = (MODCOMMAND::INSTR)swapdest[k];
+ if (p->instr == swapmap[k]) p->instr = (ModCommand::INSTR)swapdest[k];
}
}
p++;
Modified: trunk/OpenMPT/mptrack/CleanupSong.h
===================================================================
--- trunk/OpenMPT/mptrack/CleanupSong.h 2012-02-24 23:19:27 UTC (rev 1193)
+++ trunk/OpenMPT/mptrack/CleanupSong.h 2012-02-25 20:51:28 UTC (rev 1194)
@@ -1,11 +1,13 @@
/*
- *
* CleanupSong.h
* ---------------
- * Purpose: Header file for CleanupSong.cpp
- *
+ * Purpose: Dialog for cleaning up modules (rearranging, removing unused items).
+ * Notes : (currently none)
+ * Authors: OpenMPT Devs
+ * The OpenMPT source code is released under the BSD license. Read LICENSE for more details.
*/
+
#pragma once
enum ENUM_CLEANUP_OPTIONS
Modified: trunk/OpenMPT/mptrack/CloseMainDialog.cpp
===================================================================
--- trunk/OpenMPT/mptrack/CloseMainDialog.cpp 2012-02-24 23:19:27 UTC (rev 1193)
+++ trunk/OpenMPT/mptrack/CloseMainDialog.cpp 2012-02-25 20:51:28 UTC (rev 1194)
@@ -1,10 +1,10 @@
/*
- *
* CloseMainDialog.cpp
* -------------------
- * Purpose: Code for displaying a dialog with a list of unsaved documents, and the ability to choose which documents should be saved or not.
+ * Purpose: Class for displaying a dialog with a list of unsaved documents, and the ability to choose which documents should be saved or not.
* Notes : (currently none)
* Authors: OpenMPT Devs
+ * The OpenMPT source code is released under the BSD license. Read LICENSE for more details.
*/
Modified: trunk/OpenMPT/mptrack/CloseMainDialog.h
===================================================================
--- trunk/OpenMPT/mptrack/CloseMainDialog.h 2012-02-24 23:19:27 UTC (rev 1193)
+++ trunk/OpenMPT/mptrack/CloseMainDialog.h 2012-02-25 20:51:28 UTC (rev 1194)
@@ -1,13 +1,13 @@
/*
* CloseMainDialog.h
* -----------------
- * Purpose: Header file for unsaved documents dialog.
+ * Purpose: Class for displaying a dialog with a list of unsaved documents, and the ability to choose which documents should be saved or not.
* Notes : (currently none)
* Authors: OpenMPT Devs
+ * The OpenMPT source code is released under the BSD license. Read LICENSE for more details.
*/
-#ifndef CLOSEMAINDIALOG_H
-#define CLOSEMAINDIALOG_H
+
#pragma once
//===================================
@@ -38,5 +38,3 @@
DECLARE_MESSAGE_MAP()
};
-
-#endif // CLOSEMAINDIALOG_H
\ No newline at end of file
Modified: trunk/OpenMPT/mptrack/ColourEdit.cpp
===================================================================
--- trunk/OpenMPT/mptrack/ColourEdit.cpp 2012-02-24 23:19:27 UTC (rev 1193)
+++ trunk/OpenMPT/mptrack/ColourEdit.cpp 2012-02-25 20:51:28 UTC (rev 1194)
@@ -1,5 +1,15 @@
+/*
+ * ColourEdit.cpp
+ * --------------
+ * Purpose: Implementation of a coloured edit UI item.
+ * Notes : (currently none)
+ * Authors: OpenMPT Devs
+ * The OpenMPT source code is released under the BSD license. Read LICENSE for more details.
+ */
+
+
#include "stdafx.h"
-#include ".\colouredit.h"
+#include "colouredit.h"
/////////////////////////////////////////////////////////////////////////////
// CColourEdit
Modified: trunk/OpenMPT/mptrack/ColourEdit.h
===================================================================
--- trunk/OpenMPT/mptrack/ColourEdit.h 2012-02-24 23:19:27 UTC (rev 1193)
+++ trunk/OpenMPT/mptrack/ColourEdit.h 2012-02-25 20:51:28 UTC (rev 1194)
@@ -1,4 +1,15 @@
+/*
+ * ColourEdit.h
+ * ------------
+ * Purpose: Implementation of a coloured edit UI item.
+ * Notes : (currently none)
+ * Authors: OpenMPT Devs
+ * The OpenMPT source code is released under the BSD license. Read LICENSE for more details.
+ */
+
+
#pragma once
+
#include "afxwin.h"
class CColourEdit :
Modified: trunk/OpenMPT/mptrack/CommandSet.cpp
===================================================================
--- trunk/OpenMPT/mptrack/CommandSet.cpp 2012-02-24 23:19:27 UTC (rev 1193)
+++ trunk/OpenMPT/mptrack/CommandSet.cpp 2012-02-25 20:51:28 UTC (rev 1194)
@@ -1,5 +1,13 @@
-//rewbs.customKeys
+/*
+ * CommandSet.cpp
+ * --------------
+ * Purpose: Implementation of custom key handling.
+ * Notes : (currently none)
+ * Authors: OpenMPT Devs
+ * The OpenMPT source code is released under the BSD license. Read LICENSE for more details.
+ */
+
#include "stdafx.h"
#include "commandset.h"
#include "resource.h"
Modified: trunk/OpenMPT/mptrack/CommandSet.h
===================================================================
--- trunk/OpenMPT/mptrack/CommandSet.h 2012-02-24 23:19:27 UTC (rev 1193)
+++ trunk/OpenMPT/mptrack/CommandSet.h 2012-02-25 20:51:28 UTC (rev 1194)
@@ -1,5 +1,13 @@
-//rewbs.customKeys
+/*
+ * CommandSet.h
+ * ------------
+ * Purpose: Header file for custom key handling: List of supported keyboard shortcuts and class for them.
+ * Notes : (currently none)
+ * Authors: OpenMPT Devs
+ * The OpenMPT source code is released under the BSD license. Read LICENSE for more details.
+ */
+
#pragma once
#include "afxtempl.h"
#include <string>
Modified: trunk/OpenMPT/mptrack/CreditStatic.cpp
===================================================================
--- trunk/OpenMPT/mptrack/CreditStatic.cpp 2012-02-24 23:19:27 UTC (rev 1193)
+++ trunk/OpenMPT/mptrack/CreditStatic.cpp 2012-02-25 20:51:28 UTC (rev 1194)
@@ -1,6 +1,12 @@
-// CreditStatic.cpp : implementation file
-//
+/*
+ * CreditStatic.cpp
+ * ----------------
+ * Purpose: Implementation of scrolling credits control.
+ * Notes : Ugly! :)
+ * Authors: Pel K. Txnder, http://www.codeguru.com/cpp/controls/staticctrl/article.php/c2903
+ */
+
#include "stdafx.h"
#include "CreditStatic.h"
Modified: trunk/OpenMPT/mptrack/CreditStatic.h
===================================================================
--- trunk/OpenMPT/mptrack/CreditStatic.h 2012-02-24 23:19:27 UTC (rev 1193)
+++ trunk/OpenMPT/mptrack/CreditStatic.h 2012-02-25 20:51:28 UTC (rev 1194)
@@ -1,10 +1,14 @@
+/*
+ * CreditStatic.h
+ * --------------
+ * Purpose: Implementation of scrolling credits control.
+ * Notes : Ugly! :)
+ * Authors: Pel K. Txnder, http://www.codeguru.com/cpp/controls/staticctrl/article.php/c2903
+ */
+
+
#pragma once
-#ifndef CREDITSTATIC_H
-#define CREDITSTATIC_H
-// CreditStatic.h : header file
-//
-
#define DISPLAY_SLOW 0
#define DISPLAY_MEDIUM 1
#define DISPLAY_FAST 2
@@ -114,5 +118,3 @@
//{{AFX_INSERT_LOCATION}}
// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // CREDITSTATIC_H
Modified: trunk/OpenMPT/mptrack/Ctrl_com.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_com.cpp 2012-02-24 23:19:27 UTC (rev 1193)
+++ trunk/OpenMPT/mptrack/Ctrl_com.cpp 2012-02-25 20:51:28 UTC (rev 1194)
@@ -1,3 +1,14 @@
+/*
+ * ctrl_com.cpp
+ * ------------
+ * Purpose: Song comments tab, upper panel.
+ * Notes : (currently none)
+ * Authors: Olivier Lapicque
+ * OpenMPT Devs
+ * The OpenMPT source code is released under the BSD license. Read LICENSE for more details.
+ */
+
+
#include "stdafx.h"
#include "mptrack.h"
#include "mainfrm.h"
Modified: trunk/OpenMPT/mptrack/Ctrl_com.h
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_com.h 2012-02-24 23:19:27 UTC (rev 1193)
+++ trunk/OpenMPT/mptrack/Ctrl_com.h 2012-02-25 20:51:28 UTC (rev 1194)
@@ -1,7 +1,16 @@
-#ifndef _CONTROL_COMMENTS_H_
-#define _CONTROL_COMMENTS_H_
+/*
+ * ctrl_com.h
+ * ----------
+ * Purpose: Song comments tab, upper panel.
+ * Notes : (currently none)
+ * Authors: Olivier Lapicque
+ * OpenMPT Devs
+ * The OpenMPT source code is released under the BSD license. Read LICENSE for more details.
+ */
+#pragma once
+
//========================================
class CCtrlComments: public CModControlDlg
//========================================
@@ -34,5 +43,3 @@
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
};
-
-#endif
Modified: trunk/OpenMPT/mptrack/Ctrl_gen.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_gen.cpp 2012-02-24 23:19:27 UTC (rev 1193)
+++ trunk/OpenMPT/mptrack/Ctrl_gen.cpp 2012-02-25 20:51:28 UTC (rev 1194)
@@ -1,3 +1,14 @@
+/*
+ * ctrl_gen.cpp
+ * ------------
+ * Purpose: General tab, upper panel.
+ * Notes : (currently none)
+ * Authors: Olivier Lapicque
+ * OpenMPT Devs
+ * The OpenMPT source code is released under the BSD license. Read LICENSE for more details.
+ */
+
+
#include "stdafx.h"
#include "mptrack.h"
#include "mainfrm.h"
Modified: trunk/OpenMPT/mptrack/Ctrl_gen.h
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_gen.h 2012-02-24 23:19:27 UTC (rev 1193)
+++ trunk/OpenMPT/mptrack/Ctrl_g...
[truncated message content] |
