Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[3001] trunk/OpenMPT
|
From: <sag...@us...> - 2013-10-24 11:57:23
|
Revision: 3001
http://sourceforge.net/p/modplug/code/3001
Author: saga-games
Date: 2013-10-24 11:57:14 +0000 (Thu, 24 Oct 2013)
Log Message:
-----------
[Ref] More warning clenaups and additional changes for 64-bit builds
Modified Paths:
--------------
trunk/OpenMPT/include/soundtouch/OpenMPT.txt
trunk/OpenMPT/include/soundtouch/STTypes.h
trunk/OpenMPT/mptrack/Vstplug.cpp
trunk/OpenMPT/mptrack/Vstplug.h
trunk/OpenMPT/plugins/MidiInOut/MidiInOut.vcxproj
trunk/OpenMPT/soundlib/Load_mo3.cpp
trunk/OpenMPT/soundlib/Load_wav.cpp
Added Paths:
-----------
trunk/OpenMPT/mptrack/res/rt_manif64.bin
Modified: trunk/OpenMPT/include/soundtouch/OpenMPT.txt
===================================================================
--- trunk/OpenMPT/include/soundtouch/OpenMPT.txt 2013-10-24 11:36:56 UTC (rev 3000)
+++ trunk/OpenMPT/include/soundtouch/OpenMPT.txt 2013-10-24 11:57:14 UTC (rev 3001)
@@ -4,5 +4,10 @@
The "samples" parameter type of soundtouch_putSamples (line 116) has been changed
from float to short.
+In STTypes.h, the preprocessor statement
+#if (WIN32 || __i386__ || __x86_64__)
+has been changed to
+#if ((WIN32 && defined(_M_IX86)) || __i386__ || __x86_64__)
+
For building, premake4 is used to generate Visual Studio project files.
See ../premake4.lua for details.
Modified: trunk/OpenMPT/include/soundtouch/STTypes.h
===================================================================
--- trunk/OpenMPT/include/soundtouch/STTypes.h 2013-10-24 11:36:56 UTC (rev 3000)
+++ trunk/OpenMPT/include/soundtouch/STTypes.h 2013-10-24 11:57:14 UTC (rev 3001)
@@ -86,7 +86,7 @@
#endif
- #if (WIN32 || __i386__ || __x86_64__)
+ #if ((WIN32 && defined(_M_IX86)) || __i386__ || __x86_64__)
/// Define this to allow X86-specific assembler/intrinsic optimizations.
/// Notice that library contains also usual C++ versions of each of these
/// these routines, so if you're having difficulties getting the optimized
Modified: trunk/OpenMPT/mptrack/Vstplug.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Vstplug.cpp 2013-10-24 11:36:56 UTC (rev 3000)
+++ trunk/OpenMPT/mptrack/Vstplug.cpp 2013-10-24 11:57:14 UTC (rev 3001)
@@ -2062,6 +2062,7 @@
float out[2][MIXBUFFERSIZE]; // scratch buffers
float maxVal = 0.0f;
+ mixBuffer.ClearInputBuffers(MIXBUFFERSIZE);
while(numSamples > 0)
{
@@ -2069,7 +2070,6 @@
LimitMax(renderSamples, CountOf(out[0]));
MemsetZero(out);
- mixBuffer.ClearInputBuffers(renderSamples);
Process(out[0], out[1], renderSamples);
for(size_t i = 0; i < renderSamples; i++)
{
@@ -2823,13 +2823,6 @@
}
-BOOL CVstPlugin::GetCommandName(UINT nIndex, LPSTR pszName)
-//---------------------------------------------------------
-{
- return Dispatch(effGetParamName, nIndex, 0, pszName, 0.0f);
-}
-
-
CAbstractVstEditor* CVstPlugin::GetEditor()
//-----------------------------------------
{
Modified: trunk/OpenMPT/mptrack/Vstplug.h
===================================================================
--- trunk/OpenMPT/mptrack/Vstplug.h 2013-10-24 11:36:56 UTC (rev 3000)
+++ trunk/OpenMPT/mptrack/Vstplug.h 2013-10-24 11:57:14 UTC (rev 3001)
@@ -219,7 +219,6 @@
void ToggleEditor();
void GetPluginType(LPSTR pszType);
BOOL GetDefaultEffectName(LPSTR pszName);
- BOOL GetCommandName(UINT index, LPSTR pszName);
CAbstractVstEditor* GetEditor(); //rewbs.defaultPlugGUI
void Bypass(bool bypass = true);
Added: trunk/OpenMPT/mptrack/res/rt_manif64.bin
===================================================================
--- trunk/OpenMPT/mptrack/res/rt_manif64.bin (rev 0)
+++ trunk/OpenMPT/mptrack/res/rt_manif64.bin 2013-10-24 11:57:14 UTC (rev 3001)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly
+ xmlns="urn:schemas-microsoft-com:asm.v1"
+ manifestVersion="1.0">
+ <assemblyIdentity
+ processorArchitecture="amd64"
+ version="5.1.0.0"
+ type="win32"
+ name="mptrack.exe"/>
+ <description>OpenMPT</description>
+ <dependency>
+ <dependentAssembly>
+ <assemblyIdentity
+ type="win32"
+ name="Microsoft.Windows.Common-Controls"
+ version="6.0.0.0"
+ publicKeyToken="6595b64144ccf1df"
+ language="*"
+ processorArchitecture="amd64"/>
+ </dependentAssembly>
+ </dependency>
+</assembly>
\ No newline at end of file
Modified: trunk/OpenMPT/plugins/MidiInOut/MidiInOut.vcxproj
===================================================================
--- trunk/OpenMPT/plugins/MidiInOut/MidiInOut.vcxproj 2013-10-24 11:36:56 UTC (rev 3000)
+++ trunk/OpenMPT/plugins/MidiInOut/MidiInOut.vcxproj 2013-10-24 11:57:14 UTC (rev 3001)
@@ -111,7 +111,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../../../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>../../include/;../../include/vstsdk2.4/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;AGAIN_EXPORTS;VST_64BIT_PLATFORM=1;_CRT_SECURE_NO_DEPRECATE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -168,7 +168,7 @@
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
- <AdditionalIncludeDirectories>../../../../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>../../include/;../../include/vstsdk2.4/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;AGAIN_EXPORTS;VST_64BIT_PLATFORM=1;_CRT_SECURE_NO_DEPRECATE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PrecompiledHeader>
@@ -177,7 +177,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <ModuleDefinitionFile>../../win/vstplug.def</ModuleDefinitionFile>
+ <ModuleDefinitionFile>../../include/vstsdk2.4/public.sdk/samples/vst2.x/win/vstplug.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
Modified: trunk/OpenMPT/soundlib/Load_mo3.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_mo3.cpp 2013-10-24 11:36:56 UTC (rev 3000)
+++ trunk/OpenMPT/soundlib/Load_mo3.cpp 2013-10-24 11:57:14 UTC (rev 3001)
@@ -46,7 +46,7 @@
file.Rewind();
const void *stream = file.GetRawData();
- int length = file.GetLength();
+ uint32 length = mpt::saturate_cast<uint32>(file.GetLength());
bool result = false; // Result of trying to load the module, false == fail.
@@ -68,7 +68,7 @@
// Decode a MO3 file (returns the same "exit codes" as UNMO3.EXE, eg. 0=success)
// IN: data/len = MO3 data/len
// OUT: data/len = decoded data/len (if successful)
- typedef int (WINAPI * UNMO3_DECODE)(const void **data, int *len);
+ typedef int (WINAPI * UNMO3_DECODE)(const void **data, uint32 *len);
// Free the data returned by UNMO3_Decode
typedef void (WINAPI * UNMO3_FREE)(const void *data);
Modified: trunk/OpenMPT/soundlib/Load_wav.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_wav.cpp 2013-10-24 11:36:56 UTC (rev 3000)
+++ trunk/OpenMPT/soundlib/Load_wav.cpp 2013-10-24 11:57:14 UTC (rev 3001)
@@ -69,7 +69,7 @@
// Setting up module length
// Calculate sample length in ticks at tempo 125
- const uint32 sampleTicks = ((sampleLength * 50) / wavFile.GetSampleRate()) + 1;
+ const uint32 sampleTicks = mpt::saturate_cast<uint32>(((sampleLength * 50) / wavFile.GetSampleRate()) + 1);
uint32 ticksPerRow = std::max((sampleTicks + 63u) / 63u, 1u);
Order.clear();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
