diff --git a/README.md b/README.md
index 0329225bf..1c2a937d6 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ if you're interested in writing your own frontend, [api documentation is availab
- grab the [Visual Studio 2017 Community Edition](https://www.visualstudio.com/en-us/downloads/download-visual-studio-vs.aspx) and install the 32-bit c++ compiler.
- clone the musikcube sources: `git clone https://github.com/clangen/musikcube.git`
-- install the [32 bit version of boost 1.64](https://sourceforge.net/projects/boost/files/boost-binaries/1.64.0_b2/boost_1_64_0_b2-msvc-14.1-32.exe/download). ensure it shares the same parent directory with musikcube. e.g: `c:\src\musikcube` and `c:\src\boost_1_64_0_b2` -- the project's solution will reference it via relative path.
+- install the [32 bit version of boost 1.64](https://sourceforge.net/projects/boost/files/boost-binaries/1.64.0/boost_1_64_0-msvc-14.1-32.exe/download). ensure it shares the same parent directory with musikcube. e.g: `c:\src\musikcube` and `c:\src\boost_1_64_0` -- the project's solution will reference it via relative path.
- open `musikcube.sln` and build/run.
## mac
diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj
index c48bc647f..be6bfee39 100755
--- a/src/core/core.vcxproj
+++ b/src/core/core.vcxproj
@@ -54,7 +54,7 @@
Disabled
- ./;../;../3rdparty/include/;../3rdparty/win32_include;../../../boost_1_64_0_b2;%(AdditionalIncludeDirectories)
+ ./;../;../3rdparty/include/;../3rdparty/win32_include;../../../boost_1_64_0;%(AdditionalIncludeDirectories)
WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;XML_STATIC;%(PreprocessorDefinitions)
true
EnableFastChecks
@@ -75,7 +75,7 @@
Default
true
Speed
- ./;../;../3rdparty/include/;../3rdparty/win32_include;../../../boost_1_64_0_b2;%(AdditionalIncludeDirectories)
+ ./;../;../3rdparty/include/;../3rdparty/win32_include;../../../boost_1_64_0;%(AdditionalIncludeDirectories)
WIN32;_CRT_SECURE_NO_DEPRECATE;XML_STATIC;%(PreprocessorDefinitions)
MultiThreaded
Use
diff --git a/src/glue/glue.vcxproj b/src/glue/glue.vcxproj
index 30a9f7841..b27c32585 100644
--- a/src/glue/glue.vcxproj
+++ b/src/glue/glue.vcxproj
@@ -54,7 +54,7 @@
Disabled
- ./;../;../3rdparty/include/;../3rdparty/win32_include;../../../boost_1_64_0_b2;%(AdditionalIncludeDirectories)
+ ./;../;../3rdparty/include/;../3rdparty/win32_include;../../../boost_1_64_0;%(AdditionalIncludeDirectories)
WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;XML_STATIC;%(PreprocessorDefinitions)
true
EnableFastChecks
@@ -74,7 +74,7 @@
Default
true
Speed
- ./;../;../3rdparty/include/;../3rdparty/win32_include;../../../boost_1_64_0_b2;%(AdditionalIncludeDirectories)
+ ./;../;../3rdparty/include/;../3rdparty/win32_include;../../../boost_1_64_0;%(AdditionalIncludeDirectories)
WIN32;_CRT_SECURE_NO_DEPRECATE;XML_STATIC;%(PreprocessorDefinitions)
MultiThreaded
Use
diff --git a/src/musikbox/musikbox.vcxproj b/src/musikbox/musikbox.vcxproj
index 267428e00..b0132029a 100755
--- a/src/musikbox/musikbox.vcxproj
+++ b/src/musikbox/musikbox.vcxproj
@@ -60,7 +60,7 @@
Disabled
- ./;../;../3rdparty/include;../3rdparty/win32_include;../../../boost_1_64_0_b2;%(AdditionalIncludeDirectories)
+ ./;../;../3rdparty/include;../3rdparty/win32_include;../../../boost_1_64_0;%(AdditionalIncludeDirectories)
WIN32;CURL_STATICLIB;_DEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
true
EnableFastChecks
@@ -74,7 +74,7 @@
true
- ../../../boost_1_64_0_b2/lib32-msvc-14.1;../3rdparty/win32_lib;%(AdditionalLibraryDirectories)
+ ../../../boost_1_64_0/lib32-msvc-14.1;../3rdparty/win32_lib;%(AdditionalLibraryDirectories)
%(IgnoreSpecificDefaultLibraries)
true
Windows
@@ -95,7 +95,7 @@ xcopy "$(SolutionDir)src\plugins\websocket_remote\3rdparty\win32_bin\$(Configura
- ./;../;../3rdparty/include;../3rdparty/win32_include;../../../boost_1_64_0_b2;%(AdditionalIncludeDirectories)
+ ./;../;../3rdparty/include;../3rdparty/win32_include;../../../boost_1_64_0;%(AdditionalIncludeDirectories)
WIN32;CURL_STATICLIB;NDEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
MultiThreaded
Use
@@ -111,7 +111,7 @@ xcopy "$(SolutionDir)src\plugins\websocket_remote\3rdparty\win32_bin\$(Configura
true
- ../../../boost_1_64_0_b2/lib32-msvc-14.1;../3rdparty/win32_lib;%(AdditionalLibraryDirectories)
+ ../../../boost_1_64_0/lib32-msvc-14.1;../3rdparty/win32_lib;%(AdditionalLibraryDirectories)
%(IgnoreSpecificDefaultLibraries)
false
Windows
diff --git a/src/musikwin/app/view/MainWindow.cpp b/src/musikwin/app/view/MainWindow.cpp
index e8b5151f9..23112580e 100644
--- a/src/musikwin/app/view/MainWindow.cpp
+++ b/src/musikwin/app/view/MainWindow.cpp
@@ -53,7 +53,7 @@ class MainWindow::Win32MessageQueue : public MessageQueue {
this->nextTimerTime = -1;
}
- virtual void Post(IMessagePtr message, int64 delayMs = 0) {
+ virtual void Post(IMessagePtr message, int64_t delayMs = 0) {
MessageQueue::Post(message, delayMs);
::PostMessage(hwnd, WM_SCHEDULE_CORE_DISPATCH, 0, 0);
}
@@ -64,17 +64,17 @@ class MainWindow::Win32MessageQueue : public MessageQueue {
}
void ScheduleNext() {
- int64 now = duration_cast(
+ int64_t now = duration_cast(
system_clock::now().time_since_epoch()).count();
- int64 next = this->GetNextMessageTime();
+ int64_t next = this->GetNextMessageTime();
bool dispatch =
(nextTimerTime > 0 && next < this->nextTimerTime) ||
(next > 0 && nextTimerTime <= 0);
if (dispatch) {
- int64 delayMs = next - now;
+ int64_t delayMs = next - now;
if (delayMs > 0) {
::SetTimer(hwnd, DISPATCH_TIMER_ID, (UINT)delayMs, nullptr);
this->nextTimerTime = next;
@@ -88,7 +88,7 @@ class MainWindow::Win32MessageQueue : public MessageQueue {
}
private:
- int64 nextTimerTime;
+ int64_t nextTimerTime;
HWND hwnd;
};
diff --git a/src/musikwin/musikwin.vcxproj b/src/musikwin/musikwin.vcxproj
index 72f41206d..3a00cb1a3 100644
--- a/src/musikwin/musikwin.vcxproj
+++ b/src/musikwin/musikwin.vcxproj
@@ -95,14 +95,14 @@
Disabled
WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
true
- ./;../;../3rdparty/include;../3rdparty/win32_include;../../../boost_1_64_0_b2;%(AdditionalIncludeDirectories)
+ ./;../;../3rdparty/include;../3rdparty/win32_include;../../../boost_1_64_0;%(AdditionalIncludeDirectories)
pch.h
MultiThreadedDebug
Windows
true
- ../../../boost_1_64_0_b2/lib32-msvc-14.1;%(AdditionalLibraryDirectories)
+ ../../../boost_1_64_0/lib32-msvc-14.1;%(AdditionalLibraryDirectories)
comctl32.lib;%(AdditionalDependencies)
@@ -131,7 +131,7 @@
WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
true
pch.h
- ./;../;../3rdparty/include;../3rdparty/win32_include;../../../boost_1_64_0_b2;%(AdditionalIncludeDirectories)
+ ./;../;../3rdparty/include;../3rdparty/win32_include;../../../boost_1_64_0;%(AdditionalIncludeDirectories)
MultiThreaded
Speed
@@ -140,7 +140,7 @@
true
true
true
- ../../../boost_1_64_0_b2/lib32-msvc-14.1;%(AdditionalLibraryDirectories)
+ ../../../boost_1_64_0/lib32-msvc-14.1;%(AdditionalLibraryDirectories)
comctl32.lib;%(AdditionalDependencies)
diff --git a/src/plugins/cddadecoder/cddadecoder.vcxproj b/src/plugins/cddadecoder/cddadecoder.vcxproj
index 1aa8153cc..4ba7712af 100755
--- a/src/plugins/cddadecoder/cddadecoder.vcxproj
+++ b/src/plugins/cddadecoder/cddadecoder.vcxproj
@@ -55,7 +55,7 @@
Disabled
- ../../;../../3rdparty/include;../../3rdparty/win32_include;../../../../boost_1_64_0_b2;%(AdditionalIncludeDirectories)
+ ../../;../../3rdparty/include;../../3rdparty/win32_include;../../../../boost_1_64_0;%(AdditionalIncludeDirectories)
WIN32;_DEBUG;_LIB;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
true
EnableFastChecks
@@ -77,7 +77,7 @@
- ../../;../../3rdparty/include;../../3rdparty/win32_include;../../../../boost_1_64_0_b2;%(AdditionalIncludeDirectories)
+ ../../;../../3rdparty/include;../../3rdparty/win32_include;../../../../boost_1_64_0;%(AdditionalIncludeDirectories)
WIN32;NDEBUG;_LIB;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
MultiThreaded
diff --git a/src/plugins/httpdatastream/httpdatastream.vcxproj b/src/plugins/httpdatastream/httpdatastream.vcxproj
index 6f1d534c1..259fe7ddb 100644
--- a/src/plugins/httpdatastream/httpdatastream.vcxproj
+++ b/src/plugins/httpdatastream/httpdatastream.vcxproj
@@ -55,7 +55,7 @@
Disabled
- ../../;../../3rdparty/include;../../3rdparty/win32_include;../../../../boost_1_64_0_b2;%(AdditionalIncludeDirectories)
+ ../../;../../3rdparty/include;../../3rdparty/win32_include;../../../../boost_1_64_0;%(AdditionalIncludeDirectories)
WIN32;_DEBUG;_LIB;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
true
EnableFastChecks
@@ -70,14 +70,14 @@
shlwapi.lib;libcurl.lib;%(AdditionalDependencies)
- ../../3rdparty/win32_lib;../../../../boost_1_64_0_b2/lib32-msvc-14.1;%(AdditionalLibraryDirectories)
+ ../../3rdparty/win32_lib;../../../../boost_1_64_0/lib32-msvc-14.1;%(AdditionalLibraryDirectories)
true
false
- ../../;../../3rdparty/include;../../3rdparty/win32_include;../../../../boost_1_64_0_b2;%(AdditionalIncludeDirectories)
+ ../../;../../3rdparty/include;../../3rdparty/win32_include;../../../../boost_1_64_0;%(AdditionalIncludeDirectories)
WIN32;NDEBUG;_LIB;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
MultiThreaded
@@ -94,7 +94,7 @@
shlwapi.lib;libcurl.lib;%(AdditionalDependencies)
- ../../3rdparty/win32_lib;../../../../boost_1_64_0_b2/lib32-msvc-14.1;%(AdditionalLibraryDirectories)
+ ../../3rdparty/win32_lib;../../../../boost_1_64_0/lib32-msvc-14.1;%(AdditionalLibraryDirectories)
false
diff --git a/src/plugins/taglib_plugin/taglib_plugin.vcxproj b/src/plugins/taglib_plugin/taglib_plugin.vcxproj
index 066071ec8..a42c5afc8 100755
--- a/src/plugins/taglib_plugin/taglib_plugin.vcxproj
+++ b/src/plugins/taglib_plugin/taglib_plugin.vcxproj
@@ -57,7 +57,7 @@
Disabled
- ../../;../../3rdparty/include/;../../../../boost_1_64_0_b2/;taglib-1.11;taglib-1.11/taglib;taglib-1.11/taglib/ape;taglib-1.11/taglib/asf;taglib-1.11/taglib/flac;taglib-1.11/taglib/mpc;taglib-1.11/taglib/mpeg;taglib-1.11/taglib/mpeg/id3v1;taglib-1.11/taglib/mpeg/id3v2;taglib-1.11/taglib/mpeg/id3v2/frames;taglib-1.11/taglib/ogg;taglib-1.11/taglib/ogg/flac;taglib-1.11/taglib/ogg/opus;taglib-1.11/taglib/ogg/speex;taglib-1.11/taglib/ogg/vorbis;taglib-1.11/taglib/toolkit;taglib-1.11/taglib/trueaudio;taglib-1.11/taglib/wavpack;taglib-1.11/taglib/xm;taglib-1.11/taglib/riff;taglib-1.11/taglib/riff/aiff;taglib-1.11/taglib/riff/wav;taglib-1.11/taglib/mod;taglib-1.11/taglib/s3m;taglib-1.11/taglib/mp4;taglib-1.11/taglib/it;%(AdditionalIncludeDirectories)
+ ../../;../../3rdparty/include/;../../../../boost_1_64_0/;taglib-1.11;taglib-1.11/taglib;taglib-1.11/taglib/ape;taglib-1.11/taglib/asf;taglib-1.11/taglib/flac;taglib-1.11/taglib/mpc;taglib-1.11/taglib/mpeg;taglib-1.11/taglib/mpeg/id3v1;taglib-1.11/taglib/mpeg/id3v2;taglib-1.11/taglib/mpeg/id3v2/frames;taglib-1.11/taglib/ogg;taglib-1.11/taglib/ogg/flac;taglib-1.11/taglib/ogg/opus;taglib-1.11/taglib/ogg/speex;taglib-1.11/taglib/ogg/vorbis;taglib-1.11/taglib/toolkit;taglib-1.11/taglib/trueaudio;taglib-1.11/taglib/wavpack;taglib-1.11/taglib/xm;taglib-1.11/taglib/riff;taglib-1.11/taglib/riff/aiff;taglib-1.11/taglib/riff/wav;taglib-1.11/taglib/mod;taglib-1.11/taglib/s3m;taglib-1.11/taglib/mp4;taglib-1.11/taglib/it;%(AdditionalIncludeDirectories)
WIN32;_DEBUG;_WINDOWS;_USRDLL;TAGLIB_STATIC;%(PreprocessorDefinitions)
false
EnableFastChecks
@@ -74,7 +74,7 @@
$(OutDir)$(ProjectName).dll
- ../../../../boost_1_64_0_b2/lib32-msvc-14.1;%(AdditionalLibraryDirectories)
+ ../../../../boost_1_64_0/lib32-msvc-14.1;%(AdditionalLibraryDirectories)
true
true
$(TargetDir)$(TargetName).map
@@ -89,7 +89,7 @@
Default
true
Speed
- ../../;../../3rdparty/include/;../../../../boost_1_64_0_b2/;taglib-1.11;taglib-1.11/taglib;taglib-1.11/taglib/ape;taglib-1.11/taglib/asf;taglib-1.11/taglib/flac;taglib-1.11/taglib/mpc;taglib-1.11/taglib/mpeg;taglib-1.11/taglib/mpeg/id3v1;taglib-1.11/taglib/mpeg/id3v2;taglib-1.11/taglib/mpeg/id3v2/frames;taglib-1.11/taglib/ogg;taglib-1.11/taglib/ogg/flac;taglib-1.11/taglib/ogg/opus;taglib-1.11/taglib/ogg/speex;taglib-1.11/taglib/ogg/vorbis;taglib-1.11/taglib/toolkit;taglib-1.11/taglib/trueaudio;taglib-1.11/taglib/wavpack;taglib-1.11/taglib/xm;taglib-1.11/taglib/riff;taglib-1.11/taglib/riff/aiff;taglib-1.11/taglib/riff/wav;taglib-1.11/taglib/mod;taglib-1.11/taglib/s3m;taglib-1.11/taglib/mp4;taglib-1.11/taglib/it;%(AdditionalIncludeDirectories)
+ ../../;../../3rdparty/include/;../../../../boost_1_64_0/;taglib-1.11;taglib-1.11/taglib;taglib-1.11/taglib/ape;taglib-1.11/taglib/asf;taglib-1.11/taglib/flac;taglib-1.11/taglib/mpc;taglib-1.11/taglib/mpeg;taglib-1.11/taglib/mpeg/id3v1;taglib-1.11/taglib/mpeg/id3v2;taglib-1.11/taglib/mpeg/id3v2/frames;taglib-1.11/taglib/ogg;taglib-1.11/taglib/ogg/flac;taglib-1.11/taglib/ogg/opus;taglib-1.11/taglib/ogg/speex;taglib-1.11/taglib/ogg/vorbis;taglib-1.11/taglib/toolkit;taglib-1.11/taglib/trueaudio;taglib-1.11/taglib/wavpack;taglib-1.11/taglib/xm;taglib-1.11/taglib/riff;taglib-1.11/taglib/riff/aiff;taglib-1.11/taglib/riff/wav;taglib-1.11/taglib/mod;taglib-1.11/taglib/s3m;taglib-1.11/taglib/mp4;taglib-1.11/taglib/it;%(AdditionalIncludeDirectories)
WIN32;NDEBUG;_WINDOWS;_USRDLL;TAGLIB_STATIC;%(PreprocessorDefinitions)
MultiThreaded
@@ -106,7 +106,7 @@
$(OutDir)$(ProjectName).dll
- ../../../../boost_1_64_0_b2/lib32-msvc-14.1;%(AdditionalLibraryDirectories)
+ ../../../../boost_1_64_0/lib32-msvc-14.1;%(AdditionalLibraryDirectories)
false
Windows
true
diff --git a/src/plugins/websocket_remote/websocket_remote.vcxproj b/src/plugins/websocket_remote/websocket_remote.vcxproj
index c540f6d66..fa494872e 100644
--- a/src/plugins/websocket_remote/websocket_remote.vcxproj
+++ b/src/plugins/websocket_remote/websocket_remote.vcxproj
@@ -83,12 +83,12 @@
Level3
Disabled
true
- 3rdparty/include;3rdparty/win32_include;../../3rdparty/win32_include;../../../../boost_1_64_0_b2;../../;%(AdditionalIncludeDirectories)
+ 3rdparty/include;3rdparty/win32_include;../../3rdparty/win32_include;../../../../boost_1_64_0;../../;%(AdditionalIncludeDirectories)
WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;ZLIB_WINAPI;MHD_W32LIB;BUILDING_MHD_LIB;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)
MultiThreadedDebug
- ../../../../boost_1_64_0_b2/lib32-msvc-14.1;../../3rdparty/win32_lib;./3rdparty/win32_lib;%(AdditionalLibraryDirectories)
+ ../../../../boost_1_64_0/lib32-msvc-14.1;../../3rdparty/win32_lib;./3rdparty/win32_lib;%(AdditionalLibraryDirectories)
zlibstatD.lib;libmp3lameD.lib;%(AdditionalDependencies)
@@ -110,7 +110,7 @@
true
true
true
- 3rdparty/include;3rdparty/win32_include;../../3rdparty/win32_include;../../../../boost_1_64_0_b2;../../;%(AdditionalIncludeDirectories)
+ 3rdparty/include;3rdparty/win32_include;../../3rdparty/win32_include;../../../../boost_1_64_0;../../;%(AdditionalIncludeDirectories)
WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;ZLIB_WINAPI;MHD_W32LIB;BUILDING_MHD_LIB;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)
MultiThreaded
None
@@ -120,7 +120,7 @@
true
true
- ../../../../boost_1_64_0_b2/lib32-msvc-14.1;../../3rdparty/win32_lib;./3rdparty/win32_lib
+ ../../../../boost_1_64_0/lib32-msvc-14.1;../../3rdparty/win32_lib;./3rdparty/win32_lib
zlibstat.lib;libmp3lame.lib;%(AdditionalDependencies)
false
Windows