Fixed compilation in Visual Studio 2008.

diff --git a/.gitignore b/.gitignore
index 8ad4626..8278b24 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,8 @@
 /LameXP_*.opensdf
 /LameXP_*.sdf
 /LameXP_*.suo
+/LameXP_*.ncb
+/LameXP_*.sln.docstates
 /bin
 etc/Deployment/*.exe
 etc/Deployment/_postproc.bat

diff --git a/LameXP_VS2008.vcproj b/LameXP_VS2008.vcproj
index 976aeee..6f36bfe 100644 (file)
--- a/LameXP_VS2008.vcproj
+++ b/LameXP_VS2008.vcproj
@@ -66,7 +66,7 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalOptions="&quot;/MANIFESTDEPENDENCY:type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos; processorArchitecture=&apos;*&apos;&quot;"
-                               AdditionalDependencies="qtmaind.lib QtCored4.lib QtGuid4.lib Winmm.lib Shlwapi.lib psapi.lib"
+                               AdditionalDependencies="qtmaind.lib QtCored4.lib QtGuid4.lib Winmm.lib Shlwapi.lib Wininet.lib psapi.lib"
                                LinkIncremental="1"
                                AdditionalLibraryDirectories="&quot;$(QTDIR)\lib&quot;;&quot;$(QTDIR)\plugins\imageformats&quot;"
                                GenerateDebugInformation="true"
@@ -155,7 +155,7 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalOptions="&quot;/MANIFESTDEPENDENCY:type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos; processorArchitecture=&apos;*&apos;&quot;"
-                               AdditionalDependencies="qtmain.lib QtCore4.lib QtGui4.lib Winmm.lib Shlwapi.lib"
+                               AdditionalDependencies="qtmain.lib QtCore4.lib QtGui4.lib Winmm.lib Shlwapi.lib Wininet.lib"
                                ShowProgress="2"
                                Version=""
                                LinkIncremental="1"
@@ -253,7 +253,7 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalOptions="&quot;/MANIFESTDEPENDENCY:type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos; processorArchitecture=&apos;*&apos;&quot;"
-                               AdditionalDependencies="qtmain.lib QtCore.lib QtGui.lib QtSvg.lib qsvg.lib qico.lib Winmm.lib imm32.lib ws2_32.lib Shlwapi.lib"
+                               AdditionalDependencies="qtmain.lib QtCore.lib QtGui.lib QtSvg.lib qsvg.lib qico.lib Winmm.lib imm32.lib ws2_32.lib Shlwapi.lib Wininet.lib"
                                ShowProgress="2"
                                LinkIncremental="1"
                                AdditionalLibraryDirectories="&quot;$(SolutionDir)\etc\Prerequisites\qt4_static\lib&quot;;&quot;$(SolutionDir)\etc\Prerequisites\qt4_static\plugins\imageformats&quot;"
@@ -321,6 +321,10 @@
                                >
                        </File>
                        <File
+                               RelativePath=".\src\Decoder_Avisynth.cpp"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\src\Decoder_FLAC.cpp"
                                >
                        </File>
@@ -369,6 +373,10 @@
                                >
                        </File>
                        <File
+                               RelativePath=".\src\Dialog_CueImport.cpp"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\src\Dialog_DropBox.cpp"
                                >
                        </File>
@@ -409,6 +417,10 @@
                                >
                        </File>
                        <File
+                               RelativePath=".\src\Encoder_AC3.cpp"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\src\Encoder_FLAC.cpp"
                                >
                        </File>
@@ -469,6 +481,10 @@
                                >
                        </File>
                        <File
+                               RelativePath=".\src\Model_CueSheet.cpp"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\src\Model_FileList.cpp"
                                >
                        </File>
@@ -501,6 +517,10 @@
                                >
                        </File>
                        <File
+                               RelativePath=".\src\Thread_CueSplitter.cpp"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\src\Thread_DiskObserver.cpp"
                                >
                        </File>
@@ -593,6 +613,10 @@
                                >
                        </File>
                        <File
+                               RelativePath=".\src\Decoder_Avisynth.h"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\src\Decoder_FLAC.h"
                                >
                        </File>
@@ -671,6 +695,40 @@
                                </FileConfiguration>
                        </File>
                        <File
+                               RelativePath=".\src\Dialog_CueImport.h"
+                               >
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       >
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="MOC &quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot;"
+                                               CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot; -o &quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot; &quot;$(InputPath)&quot;"
+                                               Outputs="&quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot;"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration
+                                       Name="Release|Win32"
+                                       >
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="MOC &quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot;"
+                                               CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot; -o &quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot; &quot;$(InputPath)&quot;"
+                                               Outputs="&quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot;"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration
+                                       Name="Release_Static|Win32"
+                                       >
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="MOC &quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot;"
+                                               CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot; -o &quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot; &quot;$(InputPath)&quot;"
+                                               Outputs="&quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot;"
+                                       />
+                               </FileConfiguration>
+                       </File>
+                       <File
                                RelativePath=".\src\Dialog_DropBox.h"
                                >
                                <FileConfiguration
@@ -1011,6 +1069,20 @@
                                </FileConfiguration>
                        </File>
                        <File
+                               RelativePath=".\src\Encoder_AC3.h"
+                               >
+                               <FileConfiguration
+                                       Name="Release|Win32"
+                                       >
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="MOC &quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot;"
+                                               CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot; -o &quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot; &quot;$(InputPath)&quot;"
+                                               Outputs="&quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot;"
+                                       />
+                               </FileConfiguration>
+                       </File>
+                       <File
                                RelativePath=".\src\Encoder_FLAC.h"
                                >
                                <FileConfiguration
@@ -1247,6 +1319,40 @@
                                </FileConfiguration>
                        </File>
                        <File
+                               RelativePath=".\src\Model_CueSheet.h"
+                               >
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       >
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="MOC &quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot;"
+                                               CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot; -o &quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot; &quot;$(InputPath)&quot;"
+                                               Outputs="&quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot;"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration
+                                       Name="Release|Win32"
+                                       >
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="MOC &quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot;"
+                                               CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot; -o &quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot; &quot;$(InputPath)&quot;"
+                                               Outputs="&quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot;"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration
+                                       Name="Release_Static|Win32"
+                                       >
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="MOC &quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot;"
+                                               CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot; -o &quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot; &quot;$(InputPath)&quot;"
+                                               Outputs="&quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot;"
+                                       />
+                               </FileConfiguration>
+                       </File>
+                       <File
                                RelativePath=".\src\Model_FileList.h"
                                >
                                <FileConfiguration
@@ -1437,6 +1543,40 @@
                                >
                        </File>
                        <File
+                               RelativePath=".\src\Thread_CueSplitter.h"
+                               >
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       >
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="MOC &quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot;"
+                                               CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot; -o &quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot; &quot;$(InputPath)&quot;"
+                                               Outputs="&quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot;"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration
+                                       Name="Release|Win32"
+                                       >
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="MOC &quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot;"
+                                               CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot; -o &quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot; &quot;$(InputPath)&quot;"
+                                               Outputs="&quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot;"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration
+                                       Name="Release_Static|Win32"
+                                       >
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="MOC &quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot;"
+                                               CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot; -o &quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot; &quot;$(InputPath)&quot;"
+                                               Outputs="&quot;$(SolutionDir)tmp\MOC_$(SafeInputName).cpp&quot;"
+                                       />
+                               </FileConfiguration>
+                       </File>
+                       <File
                                RelativePath=".\src\Thread_DiskObserver.h"
                                >
                                <FileConfiguration
@@ -1693,6 +1833,10 @@
                                >
                        </File>
                        <File
+                               RelativePath=".\tmp\MOC_Dialog_CueImport.cpp"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\tmp\MOC_Dialog_DropBox.cpp"
                                >
                        </File>
@@ -1733,6 +1877,10 @@
                                >
                        </File>
                        <File
+                               RelativePath=".\tmp\MOC_Encoder_AC3.cpp"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\tmp\MOC_Encoder_FLAC.cpp"
                                >
                        </File>
@@ -1757,6 +1905,10 @@
                                >
                        </File>
                        <File
+                               RelativePath=".\tmp\MOC_Model_CueSheet.cpp"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\tmp\MOC_Model_FileList.cpp"
                                >
                        </File>
@@ -1777,6 +1929,10 @@
                                >
                        </File>
                        <File
+                               RelativePath=".\tmp\MOC_Thread_CueSplitter.cpp"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\tmp\MOC_Thread_DiskObserver.cpp"
                                >
                        </File>
@@ -2052,6 +2208,40 @@
                        Name="Dialogs"
                        >
                        <File
+                               RelativePath=".\gui\CueSheetImport.ui"
+                               >
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       >
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="UIC &quot;$(SolutionDir)tmp\UIC_$(SafeInputName).h&quot;"
+                                               CommandLine="&quot;$(QTDIR)\bin\uic.exe&quot; -o &quot;$(SolutionDir)tmp\UIC_$(SafeInputName).h&quot; &quot;$(InputPath)&quot;"
+                                               Outputs="&quot;$(SolutionDir)tmp\UIC_$(SafeInputName).h&quot;"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration
+                                       Name="Release|Win32"
+                                       >
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="UIC &quot;$(SolutionDir)tmp\UIC_$(SafeInputName).h&quot;"
+                                               CommandLine="&quot;$(QTDIR)\bin\uic.exe&quot; -o &quot;$(SolutionDir)tmp\UIC_$(SafeInputName).h&quot; &quot;$(InputPath)&quot;"
+                                               Outputs="&quot;$(SolutionDir)tmp\UIC_$(SafeInputName).h&quot;"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration
+                                       Name="Release_Static|Win32"
+                                       >
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="UIC &quot;$(SolutionDir)tmp\UIC_$(SafeInputName).h&quot;"
+                                               CommandLine="&quot;$(QTDIR)\bin\uic.exe&quot; -o &quot;$(SolutionDir)tmp\UIC_$(SafeInputName).h&quot; &quot;$(InputPath)&quot;"
+                                               Outputs="&quot;$(SolutionDir)tmp\UIC_$(SafeInputName).h&quot;"
+                                       />
+                               </FileConfiguration>
+                       </File>
+                       <File
                                RelativePath=".\gui\DropBox.ui"
                                >
                                <FileConfiguration

diff --git a/src/Dialog_About.cpp b/src/Dialog_About.cpp
index ce87c89..7ee7074 100644 (file)
--- a/src/Dialog_About.cpp
+++ b/src/Dialog_About.cpp
@@ -38,6 +38,7 @@
 #include <QLabel>
 
 #include <MMSystem.h>
+#include <math.h>
 
 //Helper macros
 #define LINK(URL) QString("<a href=\"%1\">%2</a>").arg(URL).arg(URL)

diff --git a/src/Global.cpp b/src/Global.cpp
index f6ee3dc..c44b887 100644 (file)
--- a/src/Global.cpp
+++ b/src/Global.cpp
@@ -52,6 +52,7 @@
 #include <io.h>
 #include <fcntl.h>
 #include <intrin.h>
+#include <math.h>
 
 //COM includes
 #include <Objbase.h>

diff --git a/src/Targetver.h b/src/Targetver.h
index 3a0c248..b78503a 100644 (file)
--- a/src/Targetver.h
+++ b/src/Targetver.h
@@ -28,8 +28,7 @@
 
 // If you wish to build your application for a previous Windows platform, include WinSDKVer.h and
 // set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h.
-
-#include <WinSDKVer.h>
+//#include <WinSDKVer.h>
 
 // Modify the following defines if you have to target a platform prior to the ones specified below.
 // Refer to MSDN for the latest info on corresponding values for different platforms.

diff --git a/src/Thread_CueSplitter.cpp b/src/Thread_CueSplitter.cpp
index 5a9fb0c..85ef3f6 100644 (file)
--- a/src/Thread_CueSplitter.cpp
+++ b/src/Thread_CueSplitter.cpp
@@ -36,6 +36,8 @@
 #include <QDebug>
 
 #include <math.h>
+#include <float.h>
+#include <limits>
 
 ////////////////////////////////////////////////////////////
 // Constructor