Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[5407] trunk/OpenMPT
|
From: <man...@us...> - 2015-07-12 08:46:44
|
Revision: 5407
http://sourceforge.net/p/modplug/code/5407
Author: manxorist
Date: 2015-07-12 08:46:37 +0000 (Sun, 12 Jul 2015)
Log Message:
-----------
[Imp] in_openmpt: Support VS2008.
[Imp] xmp-openmpt: Support VS2008.
Modified Paths:
--------------
trunk/OpenMPT/build/auto/build_libopenmpt.cmd
trunk/OpenMPT/build/premake/mpt-in_openmpt.lua
trunk/OpenMPT/build/premake/mpt-xmp-openmpt.lua
trunk/OpenMPT/build/regenerate_vs_projects.cmd
trunk/OpenMPT/libopenmpt/in_openmpt.cpp
trunk/OpenMPT/libopenmpt/xmp-openmpt.cpp
Added Paths:
-----------
trunk/OpenMPT/build/vs2008/in_openmpt.sln
trunk/OpenMPT/build/vs2008/in_openmpt.vcproj
trunk/OpenMPT/build/vs2008/xmp-openmpt.sln
trunk/OpenMPT/build/vs2008/xmp-openmpt.vcproj
Modified: trunk/OpenMPT/build/auto/build_libopenmpt.cmd
===================================================================
--- trunk/OpenMPT/build/auto/build_libopenmpt.cmd 2015-07-12 06:37:37 UTC (rev 5406)
+++ trunk/OpenMPT/build/auto/build_libopenmpt.cmd 2015-07-12 08:46:37 UTC (rev 5407)
@@ -21,25 +21,21 @@
devenv libopenmpt.sln /clean "ReleaseNoSSE2|%MPT_ARCH%" || goto error
devenv openmpt123.sln /clean "ReleaseNoSSE2|%MPT_ARCH%" || goto error
if "%MPT_ARCH%" == "Win32" (
- if not "%MPT_VSVER%" == "vs2008" (
- devenv in_openmpt.sln /clean "ReleaseNoSSE2|%MPT_ARCH%" || goto error
- devenv xmp-openmpt.sln /clean "ReleaseNoSSE2|%MPT_ARCH%" || goto error
- )
+ devenv in_openmpt.sln /clean "ReleaseNoSSE2|%MPT_ARCH%" || goto error
+ devenv xmp-openmpt.sln /clean "ReleaseNoSSE2|%MPT_ARCH%" || goto error
if "%MPT_VSVER%" == "vs2010" (
devenv foo_openmpt.sln /clean "ReleaseNoSSE2|%MPT_ARCH%" || goto error
- )
+ )
)
devenv libopenmpt.sln /build "ReleaseNoSSE2|%MPT_ARCH%" || goto error
devenv openmpt123.sln /build "ReleaseNoSSE2|%MPT_ARCH%" || goto error
if "%MPT_ARCH%" == "Win32" (
- if not "%MPT_VSVER%" == "vs2008" (
- devenv in_openmpt.sln /build "ReleaseNoSSE2|%MPT_ARCH%" || goto error
- devenv xmp-openmpt.sln /build "ReleaseNoSSE2|%MPT_ARCH%" || goto error
- )
+ devenv in_openmpt.sln /build "ReleaseNoSSE2|%MPT_ARCH%" || goto error
+ devenv xmp-openmpt.sln /build "ReleaseNoSSE2|%MPT_ARCH%" || goto error
if "%MPT_VSVER%" == "vs2010" (
devenv foo_openmpt.sln /build "ReleaseNoSSE2|%MPT_ARCH%" || goto error
- )
+ )
)
cd ..\.. || goto error
Modified: trunk/OpenMPT/build/premake/mpt-in_openmpt.lua
===================================================================
--- trunk/OpenMPT/build/premake/mpt-in_openmpt.lua 2015-07-12 06:37:37 UTC (rev 5406)
+++ trunk/OpenMPT/build/premake/mpt-in_openmpt.lua 2015-07-12 08:46:37 UTC (rev 5407)
@@ -1,6 +1,4 @@
-if _ACTION ~= "vs2008" then
-
project "in_openmpt"
uuid "D75AEB78-5537-49BD-9085-F92DEEFA84E8"
language "C++"
@@ -24,5 +22,3 @@
prebuildcommands { "..\\..\\build\\svn_version\\update_svn_version_vs_premake.cmd $(IntDir)" }
dofile "../../build/premake/premake-defaults-DLL.lua"
dofile "../../build/premake/premake-defaults.lua"
-
-end
Modified: trunk/OpenMPT/build/premake/mpt-xmp-openmpt.lua
===================================================================
--- trunk/OpenMPT/build/premake/mpt-xmp-openmpt.lua 2015-07-12 06:37:37 UTC (rev 5406)
+++ trunk/OpenMPT/build/premake/mpt-xmp-openmpt.lua 2015-07-12 08:46:37 UTC (rev 5407)
@@ -1,6 +1,4 @@
-if _ACTION ~= "vs2008" then
-
project "xmp-openmpt"
uuid "AEA14F53-ADB0-45E5-9823-81F4F36886C2"
language "C++"
@@ -25,5 +23,3 @@
prebuildcommands { "..\\..\\build\\svn_version\\update_svn_version_vs_premake.cmd $(IntDir)" }
dofile "../../build/premake/premake-defaults-DLL.lua"
dofile "../../build/premake/premake-defaults.lua"
-
-end
Modified: trunk/OpenMPT/build/regenerate_vs_projects.cmd
===================================================================
--- trunk/OpenMPT/build/regenerate_vs_projects.cmd 2015-07-12 06:37:37 UTC (rev 5406)
+++ trunk/OpenMPT/build/regenerate_vs_projects.cmd 2015-07-12 08:46:37 UTC (rev 5407)
@@ -17,6 +17,8 @@
%PREMAKE% --group=libopenmpt_test vs2008 || goto err
%PREMAKE% --group=libopenmpt vs2008 || goto err
+%PREMAKE% --group=in_openmpt vs2008 || goto err
+%PREMAKE% --group=xmp-openmpt vs2008 || goto err
%PREMAKE% --group=openmpt123 vs2008 || goto err
%PREMAKE% --group=PluginBridge vs2008 || goto err
%PREMAKE% --group=OpenMPT-VSTi vs2008 || goto err
Added: trunk/OpenMPT/build/vs2008/in_openmpt.sln
===================================================================
--- trunk/OpenMPT/build/vs2008/in_openmpt.sln (rev 0)
+++ trunk/OpenMPT/build/vs2008/in_openmpt.sln 2015-07-12 08:46:37 UTC (rev 5407)
@@ -0,0 +1,46 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "in_openmpt", "in_openmpt.vcproj", "{D75AEB78-5537-49BD-9085-F92DEEFA84E8}"
+ ProjectSection(ProjectDependencies) = postProject
+ {9C5101EF-3E20-4558-809B-277FDD50E878} = {9C5101EF-3E20-4558-809B-277FDD50E878}
+ {B5E0C06B-8121-426A-8FFB-4293ECAAE29C} = {B5E0C06B-8121-426A-8FFB-4293ECAAE29C}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libopenmpt", "libopenmpt.vcproj", "{9C5101EF-3E20-4558-809B-277FDD50E878}"
+ ProjectSection(ProjectDependencies) = postProject
+ {B5E0C06B-8121-426A-8FFB-4293ECAAE29C} = {B5E0C06B-8121-426A-8FFB-4293ECAAE29C}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniz", "..\vs2008-ext\miniz.vcproj", "{B5E0C06B-8121-426A-8FFB-4293ECAAE29C}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ ReleaseNoSSE2|Win32 = ReleaseNoSSE2|Win32
+ Release|Win32 = Release|Win32
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {D75AEB78-5537-49BD-9085-F92DEEFA84E8}.Debug|Win32.ActiveCfg = Debug|Win32
+ {D75AEB78-5537-49BD-9085-F92DEEFA84E8}.Debug|Win32.Build.0 = Debug|Win32
+ {D75AEB78-5537-49BD-9085-F92DEEFA84E8}.ReleaseNoSSE2|Win32.ActiveCfg = ReleaseNoSSE2|Win32
+ {D75AEB78-5537-49BD-9085-F92DEEFA84E8}.ReleaseNoSSE2|Win32.Build.0 = ReleaseNoSSE2|Win32
+ {D75AEB78-5537-49BD-9085-F92DEEFA84E8}.Release|Win32.ActiveCfg = Release|Win32
+ {D75AEB78-5537-49BD-9085-F92DEEFA84E8}.Release|Win32.Build.0 = Release|Win32
+ {9C5101EF-3E20-4558-809B-277FDD50E878}.Debug|Win32.ActiveCfg = Debug|Win32
+ {9C5101EF-3E20-4558-809B-277FDD50E878}.Debug|Win32.Build.0 = Debug|Win32
+ {9C5101EF-3E20-4558-809B-277FDD50E878}.ReleaseNoSSE2|Win32.ActiveCfg = ReleaseNoSSE2|Win32
+ {9C5101EF-3E20-4558-809B-277FDD50E878}.ReleaseNoSSE2|Win32.Build.0 = ReleaseNoSSE2|Win32
+ {9C5101EF-3E20-4558-809B-277FDD50E878}.Release|Win32.ActiveCfg = Release|Win32
+ {9C5101EF-3E20-4558-809B-277FDD50E878}.Release|Win32.Build.0 = Release|Win32
+ {B5E0C06B-8121-426A-8FFB-4293ECAAE29C}.Debug|Win32.ActiveCfg = Debug|Win32
+ {B5E0C06B-8121-426A-8FFB-4293ECAAE29C}.Debug|Win32.Build.0 = Debug|Win32
+ {B5E0C06B-8121-426A-8FFB-4293ECAAE29C}.ReleaseNoSSE2|Win32.ActiveCfg = ReleaseNoSSE2|Win32
+ {B5E0C06B-8121-426A-8FFB-4293ECAAE29C}.ReleaseNoSSE2|Win32.Build.0 = ReleaseNoSSE2|Win32
+ {B5E0C06B-8121-426A-8FFB-4293ECAAE29C}.Release|Win32.ActiveCfg = Release|Win32
+ {B5E0C06B-8121-426A-8FFB-4293ECAAE29C}.Release|Win32.Build.0 = Release|Win32
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
Property changes on: trunk/OpenMPT/build/vs2008/in_openmpt.sln
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/x-ms-sln
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+CRLF
\ No newline at end of property
Added: trunk/OpenMPT/build/vs2008/in_openmpt.vcproj
===================================================================
--- trunk/OpenMPT/build/vs2008/in_openmpt.vcproj (rev 0)
+++ trunk/OpenMPT/build/vs2008/in_openmpt.vcproj 2015-07-12 08:46:37 UTC (rev 5407)
@@ -0,0 +1,297 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="in_openmpt"
+ ProjectGUID="{D75AEB78-5537-49BD-9085-F92DEEFA84E8}"
+ RootNamespace="in_openmpt"
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="0"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="..\..\bin\Win32-Debug"
+ IntermediateDirectory="..\obj\in_openmpt\x86\Debug"
+ ConfigurationType="2"
+ UseOfMFC="1"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ CommandLine="..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..;..\..\include;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint"
+ PreprocessorDefinitions="DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ AdditionalIncludeDirectories="..\..;..\..\include;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="$(OutDir)\in_openmpt.dll"
+ LinkIncremental="2"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ ImportLibrary="..\..\bin\Win32-Debug\in_openmpt.lib"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="..\..\bin\Win32"
+ IntermediateDirectory="..\obj\in_openmpt\x86\Release"
+ ConfigurationType="2"
+ UseOfMFC="1"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ CommandLine="..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/MP"
+ Optimization="2"
+ AdditionalIncludeDirectories="..\..;..\..\include;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ StringPooling="true"
+ RuntimeLibrary="0"
+ EnableFunctionLevelLinking="true"
+ FloatingPointModel="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ AdditionalIncludeDirectories="..\..;..\..\include;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="$(OutDir)\in_openmpt.dll"
+ LinkIncremental="1"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ ImportLibrary="..\..\bin\Win32\in_openmpt.lib"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="ReleaseNoSSE2|Win32"
+ OutputDirectory="..\..\bin\Win32"
+ IntermediateDirectory="..\obj\in_openmpt\x86\ReleaseNoSSE2"
+ ConfigurationType="2"
+ UseOfMFC="1"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ CommandLine="..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/MP"
+ Optimization="2"
+ AdditionalIncludeDirectories="..\..;..\..\include;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ StringPooling="true"
+ RuntimeLibrary="0"
+ EnableFunctionLevelLinking="true"
+ FloatingPointModel="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ AdditionalIncludeDirectories="..\..;..\..\include;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="$(OutDir)\in_openmpt.dll"
+ LinkIncremental="1"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ ImportLibrary="..\..\bin\Win32\in_openmpt.lib"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ <ProjectReference
+ ReferencedProjectIdentifier="{9C5101EF-3E20-4558-809B-277FDD50E878}"
+ RelativePathToProject=".\libopenmpt.vcproj"
+ />
+ <ProjectReference
+ ReferencedProjectIdentifier="{B5E0C06B-8121-426A-8FFB-4293ECAAE29C}"
+ RelativePathToProject="..\vs2008-ext\miniz.vcproj"
+ />
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\libopenmpt\in_openmpt.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\libopenmpt\libopenmpt_settings.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\libopenmpt\libopenmpt_settings.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\libopenmpt\libopenmpt_settings.rc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\libopenmpt\resource.h"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Property changes on: trunk/OpenMPT/build/vs2008/in_openmpt.vcproj
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/x-ms-vcproj
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+CRLF
\ No newline at end of property
Added: trunk/OpenMPT/build/vs2008/xmp-openmpt.sln
===================================================================
--- trunk/OpenMPT/build/vs2008/xmp-openmpt.sln (rev 0)
+++ trunk/OpenMPT/build/vs2008/xmp-openmpt.sln 2015-07-12 08:46:37 UTC (rev 5407)
@@ -0,0 +1,55 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmp-openmpt", "xmp-openmpt.vcproj", "{AEA14F53-ADB0-45E5-9823-81F4F36886C2}"
+ ProjectSection(ProjectDependencies) = postProject
+ {9C5101EF-3E20-4558-809B-277FDD50E878} = {9C5101EF-3E20-4558-809B-277FDD50E878}
+ {B5E0C06B-8121-426A-8FFB-4293ECAAE29C} = {B5E0C06B-8121-426A-8FFB-4293ECAAE29C}
+ {07B89124-7C71-42CC-81AB-62B09BB61F9B} = {07B89124-7C71-42CC-81AB-62B09BB61F9B}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libopenmpt", "libopenmpt.vcproj", "{9C5101EF-3E20-4558-809B-277FDD50E878}"
+ ProjectSection(ProjectDependencies) = postProject
+ {B5E0C06B-8121-426A-8FFB-4293ECAAE29C} = {B5E0C06B-8121-426A-8FFB-4293ECAAE29C}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniz", "..\vs2008-ext\miniz.vcproj", "{B5E0C06B-8121-426A-8FFB-4293ECAAE29C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pugixml", "..\vs2008-ext\pugixml.vcproj", "{07B89124-7C71-42CC-81AB-62B09BB61F9B}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ ReleaseNoSSE2|Win32 = ReleaseNoSSE2|Win32
+ Release|Win32 = Release|Win32
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {AEA14F53-ADB0-45E5-9823-81F4F36886C2}.Debug|Win32.ActiveCfg = Debug|Win32
+ {AEA14F53-ADB0-45E5-9823-81F4F36886C2}.Debug|Win32.Build.0 = Debug|Win32
+ {AEA14F53-ADB0-45E5-9823-81F4F36886C2}.ReleaseNoSSE2|Win32.ActiveCfg = ReleaseNoSSE2|Win32
+ {AEA14F53-ADB0-45E5-9823-81F4F36886C2}.ReleaseNoSSE2|Win32.Build.0 = ReleaseNoSSE2|Win32
+ {AEA14F53-ADB0-45E5-9823-81F4F36886C2}.Release|Win32.ActiveCfg = Release|Win32
+ {AEA14F53-ADB0-45E5-9823-81F4F36886C2}.Release|Win32.Build.0 = Release|Win32
+ {9C5101EF-3E20-4558-809B-277FDD50E878}.Debug|Win32.ActiveCfg = Debug|Win32
+ {9C5101EF-3E20-4558-809B-277FDD50E878}.Debug|Win32.Build.0 = Debug|Win32
+ {9C5101EF-3E20-4558-809B-277FDD50E878}.ReleaseNoSSE2|Win32.ActiveCfg = ReleaseNoSSE2|Win32
+ {9C5101EF-3E20-4558-809B-277FDD50E878}.ReleaseNoSSE2|Win32.Build.0 = ReleaseNoSSE2|Win32
+ {9C5101EF-3E20-4558-809B-277FDD50E878}.Release|Win32.ActiveCfg = Release|Win32
+ {9C5101EF-3E20-4558-809B-277FDD50E878}.Release|Win32.Build.0 = Release|Win32
+ {B5E0C06B-8121-426A-8FFB-4293ECAAE29C}.Debug|Win32.ActiveCfg = Debug|Win32
+ {B5E0C06B-8121-426A-8FFB-4293ECAAE29C}.Debug|Win32.Build.0 = Debug|Win32
+ {B5E0C06B-8121-426A-8FFB-4293ECAAE29C}.ReleaseNoSSE2|Win32.ActiveCfg = ReleaseNoSSE2|Win32
+ {B5E0C06B-8121-426A-8FFB-4293ECAAE29C}.ReleaseNoSSE2|Win32.Build.0 = ReleaseNoSSE2|Win32
+ {B5E0C06B-8121-426A-8FFB-4293ECAAE29C}.Release|Win32.ActiveCfg = Release|Win32
+ {B5E0C06B-8121-426A-8FFB-4293ECAAE29C}.Release|Win32.Build.0 = Release|Win32
+ {07B89124-7C71-42CC-81AB-62B09BB61F9B}.Debug|Win32.ActiveCfg = Debug|Win32
+ {07B89124-7C71-42CC-81AB-62B09BB61F9B}.Debug|Win32.Build.0 = Debug|Win32
+ {07B89124-7C71-42CC-81AB-62B09BB61F9B}.ReleaseNoSSE2|Win32.ActiveCfg = ReleaseNoSSE2|Win32
+ {07B89124-7C71-42CC-81AB-62B09BB61F9B}.ReleaseNoSSE2|Win32.Build.0 = ReleaseNoSSE2|Win32
+ {07B89124-7C71-42CC-81AB-62B09BB61F9B}.Release|Win32.ActiveCfg = Release|Win32
+ {07B89124-7C71-42CC-81AB-62B09BB61F9B}.Release|Win32.Build.0 = Release|Win32
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
Property changes on: trunk/OpenMPT/build/vs2008/xmp-openmpt.sln
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/x-ms-sln
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+CRLF
\ No newline at end of property
Added: trunk/OpenMPT/build/vs2008/xmp-openmpt.vcproj
===================================================================
--- trunk/OpenMPT/build/vs2008/xmp-openmpt.vcproj (rev 0)
+++ trunk/OpenMPT/build/vs2008/xmp-openmpt.vcproj 2015-07-12 08:46:37 UTC (rev 5407)
@@ -0,0 +1,301 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="xmp-openmpt"
+ ProjectGUID="{AEA14F53-ADB0-45E5-9823-81F4F36886C2}"
+ RootNamespace="xmp-openmpt"
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="0"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="..\..\bin\Win32-Debug"
+ IntermediateDirectory="..\obj\xmp-openmpt\x86\Debug"
+ ConfigurationType="2"
+ UseOfMFC="1"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ CommandLine="..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..;..\..\include;..\..\include\pugixml\src;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint"
+ PreprocessorDefinitions="DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ AdditionalIncludeDirectories="..\..;..\..\include;..\..\include\pugixml\src;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="$(OutDir)\xmp-openmpt.dll"
+ LinkIncremental="2"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ ImportLibrary="..\..\bin\Win32-Debug\xmp-openmpt.lib"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="..\..\bin\Win32"
+ IntermediateDirectory="..\obj\xmp-openmpt\x86\Release"
+ ConfigurationType="2"
+ UseOfMFC="1"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ CommandLine="..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/MP"
+ Optimization="2"
+ AdditionalIncludeDirectories="..\..;..\..\include;..\..\include\pugixml\src;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ StringPooling="true"
+ RuntimeLibrary="0"
+ EnableFunctionLevelLinking="true"
+ FloatingPointModel="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ AdditionalIncludeDirectories="..\..;..\..\include;..\..\include\pugixml\src;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="$(OutDir)\xmp-openmpt.dll"
+ LinkIncremental="1"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ ImportLibrary="..\..\bin\Win32\xmp-openmpt.lib"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="ReleaseNoSSE2|Win32"
+ OutputDirectory="..\..\bin\Win32"
+ IntermediateDirectory="..\obj\xmp-openmpt\x86\ReleaseNoSSE2"
+ ConfigurationType="2"
+ UseOfMFC="1"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ CommandLine="..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/MP"
+ Optimization="2"
+ AdditionalIncludeDirectories="..\..;..\..\include;..\..\include\pugixml\src;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ StringPooling="true"
+ RuntimeLibrary="0"
+ EnableFunctionLevelLinking="true"
+ FloatingPointModel="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ AdditionalIncludeDirectories="..\..;..\..\include;..\..\include\pugixml\src;$(IntDir)\svn_version;..\svn_version;..\..\include\msinttypes\stdint"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="$(OutDir)\xmp-openmpt.dll"
+ LinkIncremental="1"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ ImportLibrary="..\..\bin\Win32\xmp-openmpt.lib"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ <ProjectReference
+ ReferencedProjectIdentifier="{9C5101EF-3E20-4558-809B-277FDD50E878}"
+ RelativePathToProject=".\libopenmpt.vcproj"
+ />
+ <ProjectReference
+ ReferencedProjectIdentifier="{B5E0C06B-8121-426A-8FFB-4293ECAAE29C}"
+ RelativePathToProject="..\vs2008-ext\miniz.vcproj"
+ />
+ <ProjectReference
+ ReferencedProjectIdentifier="{07B89124-7C71-42CC-81AB-62B09BB61F9B}"
+ RelativePathToProject="..\vs2008-ext\pugixml.vcproj"
+ />
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\libopenmpt\libopenmpt_settings.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\libopenmpt\libopenmpt_settings.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\libopenmpt\libopenmpt_settings.rc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\libopenmpt\resource.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\libopenmpt\xmp-openmpt.cpp"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Property changes on: trunk/OpenMPT/build/vs2008/xmp-openmpt.vcproj
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/x-ms-vcproj
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+CRLF
\ No newline at end of property
Modified: trunk/OpenMPT/libopenmpt/in_openmpt.cpp
===================================================================
--- trunk/OpenMPT/libopenmpt/in_openmpt.cpp 2015-07-12 06:37:37 UTC (rev 5406)
+++ trunk/OpenMPT/libopenmpt/in_openmpt.cpp 2015-07-12 08:46:37 UTC (rev 5407)
@@ -71,19 +71,19 @@
static std::string StringEncode( const std::wstring &src, UINT codepage )
{
- int required_size = WideCharToMultiByte( codepage, 0, src.c_str(), -1, nullptr, 0, nullptr, nullptr );
+ int required_size = WideCharToMultiByte( codepage, 0, src.c_str(), -1, NULL, 0, NULL, NULL );
if(required_size <= 0)
{
return std::string();
}
std::vector<CHAR> encoded_string( required_size );
- WideCharToMultiByte( codepage, 0, src.c_str(), -1, &encoded_string[0], encoded_string.size(), nullptr, nullptr );
+ WideCharToMultiByte( codepage, 0, src.c_str(), -1, &encoded_string[0], encoded_string.size(), NULL, NULL );
return &encoded_string[0];
}
static std::wstring StringDecode( const std::string & src, UINT codepage )
{
- int required_size = MultiByteToWideChar( codepage, 0, src.c_str(), -1, nullptr, 0 );
+ int required_size = MultiByteToWideChar( codepage, 0, src.c_str(), -1, NULL, 0 );
if(required_size <= 0)
{
return std::wstring();
@@ -200,7 +200,7 @@
LIBOPENMPT_SETTINGS_LOAD();
if ( !self ) {
self = new self_winamp_t();
- inmod.FileExtensions = self->filetypes_string.data();
+ inmod.FileExtensions = &(self->filetypes_string[0]);
}
}
@@ -382,20 +382,20 @@
int frames = 0;
switch ( self->channels ) {
case 1:
- frames = self->mod->read( self->samplerate, WINAMP_BUFFER_SIZE_FRAMES, self->buffer.data()+0*WINAMP_BUFFER_SIZE_FRAMES );
+ frames = self->mod->read( self->samplerate, WINAMP_BUFFER_SIZE_FRAMES, (&(self->buffer[0]))+0*WINAMP_BUFFER_SIZE_FRAMES );
for ( int frame = 0; frame < frames; frame++ ) {
self->interleaved_buffer[frame*1+0] = self->buffer[0*WINAMP_BUFFER_SIZE_FRAMES+frame];
}
break;
case 2:
- frames = self->mod->read( self->samplerate, WINAMP_BUFFER_SIZE_FRAMES, self->buffer.data()+0*WINAMP_BUFFER_SIZE_FRAMES, self->buffer.data()+1*WINAMP_BUFFER_SIZE_FRAMES );
+ frames = self->mod->read( self->samplerate, WINAMP_BUFFER_SIZE_FRAMES, (&(self->buffer[0]))+0*WINAMP_BUFFER_SIZE_FRAMES, (&(self->buffer[0]))+1*WINAMP_BUFFER_SIZE_FRAMES );
for ( int frame = 0; frame < frames; frame++ ) {
self->interleaved_buffer[frame*2+0] = self->buffer[0*WINAMP_BUFFER_SIZE_FRAMES+frame];
self->interleaved_buffer[frame*2+1] = self->buffer[1*WINAMP_BUFFER_SIZE_FRAMES+frame];
}
break;
case 4:
- frames = self->mod->read( self->samplerate, WINAMP_BUFFER_SIZE_FRAMES, self->buffer.data()+0*WINAMP_BUFFER_SIZE_FRAMES, self->buffer.data()+1*WINAMP_BUFFER_SIZE_FRAMES, self->buffer.data()+2*WINAMP_BUFFER_SIZE_FRAMES, self->buffer.data()+3*WINAMP_BUFFER_SIZE_FRAMES );
+ frames = self->mod->read( self->samplerate, WINAMP_BUFFER_SIZE_FRAMES, (&(self->buffer[0]))+0*WINAMP_BUFFER_SIZE_FRAMES, (&(self->buffer[0]))+1*WINAMP_BUFFER_SIZE_FRAMES, (&(self->buffer[0]))+2*WINAMP_BUFFER_SIZE_FRAMES, (&(self->buffer[0]))+3*WINAMP_BUFFER_SIZE_FRAMES );
for ( int frame = 0; frame < frames; frame++ ) {
self->interleaved_buffer[frame*4+0] = self->buffer[0*WINAMP_BUFFER_SIZE_FRAMES+frame];
self->interleaved_buffer[frame*4+1] = self->buffer[1*WINAMP_BUFFER_SIZE_FRAMES+frame];
@@ -409,13 +409,13 @@
} else {
self->decode_position_frames += frames;
std::int64_t decode_pos_ms = (self->decode_position_frames * 1000 / self->samplerate );
- inmod.SAAddPCMData( self->interleaved_buffer.data(), self->channels, BPS, (int)decode_pos_ms );
- inmod.VSAAddPCMData( self->interleaved_buffer.data(), self->channels, BPS, (int)decode_pos_ms );
+ inmod.SAAddPCMData( &( self->interleaved_buffer[0] ), self->channels, BPS, (int)decode_pos_ms );
+ inmod.VSAAddPCMData( &( self->interleaved_buffer[0] ), self->channels, BPS, (int)decode_pos_ms );
if ( dsp_active ) {
- frames = inmod.dsp_dosamples( self->interleaved_buffer.data(), frames, BPS, self->channels, self->samplerate );
+ frames = inmod.dsp_dosamples( &( self->interleaved_buffer[0] ), frames, BPS, self->channels, self->samplerate );
}
int bytes = frames * self->channels * sizeof( signed short );
- inmod.outMod->Write( (char*)self->interleaved_buffer.data(), bytes );
+ inmod.outMod->Write( (char*)&( self->interleaved_buffer[0] ), bytes );
}
} else {
Sleep( 10 );
Modified: trunk/OpenMPT/libopenmpt/xmp-openmpt.cpp
===================================================================
--- trunk/OpenMPT/libopenmpt/xmp-openmpt.cpp 2015-07-12 06:37:37 UTC (rev 5406)
+++ trunk/OpenMPT/libopenmpt/xmp-openmpt.cpp 2015-07-12 08:46:37 UTC (rev 5407)
@@ -90,6 +90,8 @@
#include <sstream>
#include <string>
+#include <cmath>
+
#include <pugixml.hpp>
#define SHORT_TITLE "xmp-openmpt"
@@ -116,7 +118,7 @@
struct self_xmplay_t;
-static self_xmplay_t * self = nullptr;
+static self_xmplay_t * self = 0;
static void save_options();
@@ -135,8 +137,8 @@
: samplerate(48000)
, num_channels(2)
, settings(TEXT(SHORT_TITLE), false)
- , mod(nullptr)
- , pattern_vis(nullptr)
+ , mod(0)
+ , pattern_vis(0)
, tempo_factor(0)
, pitch_factor(0)
, single_subsong_mode(false)
@@ -149,9 +151,9 @@
}
void delete_mod() {
if ( mod ) {
- pattern_vis = nullptr;
+ pattern_vis = 0;
delete mod;
- mod = nullptr;
+ mod = 0;
}
}
~self_xmplay_t() {
@@ -164,26 +166,26 @@
std::string result = native_string ? native_string : "";
if ( native_string ) {
xmpfmisc->Free( native_string );
- native_string = nullptr;
+ native_string = 0;
}
return result;
}
static std::string StringEncode( const std::wstring &src, UINT codepage )
{
- int required_size = WideCharToMultiByte( codepage, 0, src.c_str(), -1, nullptr, 0, nullptr, nullptr );
+ int required_size = WideCharToMultiByte( codepage, 0, src.c_str(), -1, NULL, 0, NULL, NULL );
if(required_size <= 0)
{
return std::string();
}
std::vector<CHAR> encoded_string( required_size );
- WideCharToMultiByte( codepage, 0, src.c_str(), -1, &encoded_string[0], encoded_string.size(), nullptr, nullptr );
+ WideCharToMultiByte( codepage, 0, src.c_str(), -1, &encoded_string[0], encoded_string.size(), NULL, NULL );
return &encoded_string[0];
}
static std::wstring StringDecode( const std::string & src, UINT codepage )
{
- int required_size = MultiByteToWideChar( codepage, 0, src.c_str(), -1, nullptr, 0 );
+ int required_size = MultiByteToWideChar( codepage, 0, src.c_str(), -1, NULL, 0 );
if(required_size <= 0)
{
return std::wstring();
@@ -304,7 +306,7 @@
}
static void WINAPI ShortcutHandler( DWORD id ) {
- if ( self->mod == nullptr ) {
+ if ( !self->mod ) {
return;
}
@@ -323,7 +325,7 @@
if ( tempo_changed ) {
std::ostringstream s;
- s << "Tempo: " << static_cast<std::int_fast32_t>( 100.0 * tempo_factor ) << "%";
+ s << "Tempo: " << static_cast<std::int32_t>( 100.0 * tempo_factor ) << "%";
xmpfmisc->ShowBubble( s.str().c_str(), 0 );
} else if ( pitch_changed) {
std::ostringstream s;
@@ -1296,9 +1298,9 @@
static BOOL WINAPI VisOpen(DWORD colors[3]) {
xmpopenmpt_lock guard;
- visDC = nullptr;
- visbitmap = nullptr;
- visfont = nullptr;
+ visDC = 0;
+ visbitmap = 0;
+ visfont = 0;
viscolors[col_background].dw = colors[0];
viscolors[col_unknown].dw = colors[1];
@@ -1366,11 +1368,11 @@
return pattern_width;
}
-static BOOL WINAPI VisRenderDC(HDC dc, SIZE size, DWORD flags) {
+static BOOL WINAPI VisRenderDC( HDC dc, SIZE size, DWORD flags ) {
xmpopenmpt_lock guard;
RECT rect;
- if( visfont == nullptr ) {
+ if ( !visfont ) {
// Force usage of a nice monospace font
LOGFONT logfont;
GetObject ( GetCurrentObject( dc, OBJ_FONT ), sizeof(logfont), &logfont );
@@ -1383,8 +1385,7 @@
return FALSE;
}
- if(flags & XMPIN_VIS_INIT)
- {
+ if ( flags & XMPIN_VIS_INIT ) {
last_pattern = -1;
}
@@ -1440,7 +1441,7 @@
int pattern_width = get_pattern_width( chars_per_channel, spaces_per_channel, num_cols, text_size.cx, channels );
int pattern_height = rows * text_size.cy;
- if ( visDC == nullptr || last_pattern != pattern ) {
+ if ( !visDC || last_pattern != pattern ) {
DeleteBitmap( visbitmap );
DeleteDC( visDC );
@@ -1682,7 +1683,7 @@
filetypes_string.push_back('\0');
file_formats = (char*)HeapAlloc( GetProcessHeap(), 0, filetypes_string.size() );
if ( file_formats ) {
- std::copy( filetypes_string.data(), filetypes_string.data() + filetypes_string.size(), file_formats );
+ std::copy( filetypes_string.begin(), filetypes_string.end(), file_formats );
xmpin.exts = file_formats;
} else {
xmpin.exts = xmp_openmpt_default_exts;
@@ -1693,7 +1694,7 @@
static void xmp_openmpt_on_dll_unload() {
delete self;
- self = nullptr;
+ self = 0;
LIBOPENMPT_SETTINGS_UNLOAD();
if ( !xmpin.exts ) {
return;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
