Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[5109] trunk/OpenMPT
|
From: <man...@us...> - 2015-05-15 14:21:59
|
Revision: 5109
http://sourceforge.net/p/modplug/code/5109
Author: manxorist
Date: 2015-05-15 14:21:53 +0000 (Fri, 15 May 2015)
Log Message:
-----------
[Fix] build: For some odd reason, VS2015 install directory has version number 14.0 instead of 13.0.
[Fix] Fix syntax error caused by invalid mutable. Spotted by VS2015RC.
[Fix] Do not expect unavailable C++14 implicit conversions to be supported. Spotted with VS2015RC.
[Fix] Remove unsatisfiable forceinline. Spotted with VS2015RC.
[Ref] Silence the most annoying of the remaining variable shadowing warnings with VS2015.
[Imp] OpenMPT now builds and runs successfully with VS2015RC.
[Ref] build: Ignore VS2015 temporary directory.
Modified Paths:
--------------
trunk/OpenMPT/build/auto/setup_vs2015.cmd
trunk/OpenMPT/common/version.cpp
trunk/OpenMPT/mptrack/Mptrack.cpp
trunk/OpenMPT/mptrack/TrackerSettings.cpp
trunk/OpenMPT/mptrack/Vstplug.h
trunk/OpenMPT/soundlib/plugins/PluginMixBuffer.h
Property Changed:
----------------
trunk/OpenMPT/build/vs2015/
Modified: trunk/OpenMPT/build/auto/setup_vs2015.cmd
===================================================================
--- trunk/OpenMPT/build/auto/setup_vs2015.cmd 2015-05-15 13:39:50 UTC (rev 5108)
+++ trunk/OpenMPT/build/auto/setup_vs2015.cmd 2015-05-15 14:21:53 UTC (rev 5109)
@@ -1,16 +1,16 @@
@echo off
-if exist "C:\Program Files (x86)\Microsoft Visual Studio 13.0\VC\vcvarsall.bat" goto win64
-if exist "C:\Program Files\Microsoft Visual Studio 13.0\VC\vcvarsall.bat" goto win32
+if exist "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" goto win64
+if exist "C:\Program Files\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" goto win32
goto setupdone
:win32
-call "C:\Program Files\Microsoft Visual Studio 13.0\VC\vcvarsall.bat" x86
+call "C:\Program Files\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
goto setupdone
:win64
-call "C:\Program Files (x86)\Microsoft Visual Studio 13.0\VC\vcvarsall.bat" x86
+call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
goto setupdone
:setupdone
Index: trunk/OpenMPT/build/vs2015
===================================================================
--- trunk/OpenMPT/build/vs2015 2015-05-15 13:39:50 UTC (rev 5108)
+++ trunk/OpenMPT/build/vs2015 2015-05-15 14:21:53 UTC (rev 5109)
Property changes on: trunk/OpenMPT/build/vs2015
___________________________________________________________________
Modified: svn:ignore
## -3,3 +3,4 ##
*.suo
*.user
ipch
+.vs
Modified: trunk/OpenMPT/common/version.cpp
===================================================================
--- trunk/OpenMPT/common/version.cpp 2015-05-15 13:39:50 UTC (rev 5108)
+++ trunk/OpenMPT/common/version.cpp 2015-05-15 14:21:53 UTC (rev 5109)
@@ -320,25 +320,25 @@
std::string GetRevisionString()
{
- std::string str;
+ std::string result;
if(GetRevision() == 0)
{
- return str;
+ return result;
}
- str = std::string("-r") + mpt::ToString(GetRevision());
+ result = std::string("-r") + mpt::ToString(GetRevision());
if(HasMixedRevisions())
{
- str += "!";
+ result += "!";
}
if(IsDirty())
{
- str += "+";
+ result += "+";
}
if(IsPackage())
{
- str += "p";
+ result += "p";
}
- return str;
+ return result;
}
std::string GetVersionStringExtended()
Modified: trunk/OpenMPT/mptrack/Mptrack.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.cpp 2015-05-15 13:39:50 UTC (rev 5108)
+++ trunk/OpenMPT/mptrack/Mptrack.cpp 2015-05-15 14:21:53 UTC (rev 5109)
@@ -723,7 +723,7 @@
: public IComponentManagerSettings
{
private:
- mutable TrackerSettings &conf;
+ TrackerSettings &conf;
public:
ComponentManagerSettings(TrackerSettings &conf)
: conf(conf)
Modified: trunk/OpenMPT/mptrack/TrackerSettings.cpp
===================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.cpp 2015-05-15 13:39:50 UTC (rev 5108)
+++ trunk/OpenMPT/mptrack/TrackerSettings.cpp 2015-05-15 14:21:53 UTC (rev 5109)
@@ -443,7 +443,7 @@
if(m_BufferLength_DEPRECATED > 1000) m_BufferLength_DEPRECATED = 1000; // 1sec
if((m_SoundDeviceID_DEPRECATED & SoundDevice::Legacy::MaskType) == SoundDevice::Legacy::TypeASIO)
{
- m_LatencyMS = m_BufferLength_DEPRECATED;
+ m_LatencyMS = m_BufferLength_DEPRECATED * 1;
m_UpdateIntervalMS = m_BufferLength_DEPRECATED / 8;
} else
{
Modified: trunk/OpenMPT/mptrack/Vstplug.h
===================================================================
--- trunk/OpenMPT/mptrack/Vstplug.h 2015-05-15 13:39:50 UTC (rev 5108)
+++ trunk/OpenMPT/mptrack/Vstplug.h 2015-05-15 14:21:53 UTC (rev 5109)
@@ -212,8 +212,8 @@
bool ShouldProcessSilence() { return isInstrument() || ((m_Effect.flags & effFlagsNoSoundInStop) == 0 && Dispatch(effGetTailSize, 0, 0, nullptr, 0.0f) != 1); }
void ResetSilence() { m_MixState.ResetSilence(); }
#ifdef MODPLUG_TRACKER
- forceinline CModDoc *GetModDoc();
- forceinline const CModDoc *GetModDoc() const;
+ CModDoc *GetModDoc();
+ const CModDoc *GetModDoc() const;
#endif // MODPLUG_TRACKER
inline CSoundFile &GetSoundFile() { return m_SndFile; }
inline const CSoundFile &GetSoundFile() const { return m_SndFile; }
Modified: trunk/OpenMPT/soundlib/plugins/PluginMixBuffer.h
===================================================================
--- trunk/OpenMPT/soundlib/plugins/PluginMixBuffer.h 2015-05-15 13:39:50 UTC (rev 5108)
+++ trunk/OpenMPT/soundlib/plugins/PluginMixBuffer.h 2015-05-15 14:21:53 UTC (rev 5109)
@@ -46,19 +46,19 @@
public:
// Allocate input and output buffers
- bool Initialize(size_t inputs, size_t outputs)
- //--------------------------------------------
+ bool Initialize(size_t inputs_, size_t outputs_)
+ //----------------------------------------------
{
// Short cut - we do not need to recreate the buffers.
- if(this->inputs == inputs && this->outputs == outputs)
+ if(inputs == inputs_ && outputs == outputs_)
{
return true;
}
Free();
- this->inputs = inputs;
- this->outputs = outputs;
+ inputs = inputs_;
+ outputs = outputs_;
try
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
