From 6345cde22532f68cc7b617d5de4bca08cfe443ed Mon Sep 17 00:00:00 2001 From: Nameless Date: Wed, 16 Mar 2016 11:34:58 +0900 Subject: [PATCH] =?UTF-8?q?#53=20#51=20sound=5Funits=5Fliterals=E3=81=AEus?= =?UTF-8?q?ing=20namespace=E3=82=92=E3=82=B0=E3=83=AD=E3=83=BC=E3=83=90?= =?UTF-8?q?=E3=83=AB=E3=81=8B=E3=82=89sound=5Funits=E3=81=AE=E4=B8=AD?= =?UTF-8?q?=E3=81=AB=E7=A7=BB=E5=8B=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ProjectDxLibEx.sln | 19 +++++++++++++++++++ ProjectDxLibEx.vcxproj | 2 ++ ProjectDxLibEx.vcxproj.filters | 6 ++++++ dxlibex/basic_types/bel.hpp | 5 +++-- samples/sound_play/sound_play/main.cpp | 1 + 5 files changed, 31 insertions(+), 2 deletions(-) diff --git a/ProjectDxLibEx.sln b/ProjectDxLibEx.sln index 3ab83b7..b127a8b 100644 --- a/ProjectDxLibEx.sln +++ b/ProjectDxLibEx.sln @@ -19,6 +19,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTest", "tests\UnitTest\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WithDxLib", "tests\WithDxLib\WithDxLib.vcxproj", "{280349E1-6523-4483-97DB-2D16B0716396}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sound_play", "samples\sound_play\sound_play\sound_play.vcxproj", "{BF458CEF-25D4-4FA5-AFF9-BF4BA4C14AD4}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution clang_Debug|Win32 = clang_Debug|Win32 @@ -119,6 +121,22 @@ Global {280349E1-6523-4483-97DB-2D16B0716396}.Release|Win32.ActiveCfg = Release|Win32 {280349E1-6523-4483-97DB-2D16B0716396}.Release|Win32.Build.0 = Release|Win32 {280349E1-6523-4483-97DB-2D16B0716396}.Release|x64.ActiveCfg = Release|Win32 + {BF458CEF-25D4-4FA5-AFF9-BF4BA4C14AD4}.clang_Debug|Win32.ActiveCfg = clang_Debug|Win32 + {BF458CEF-25D4-4FA5-AFF9-BF4BA4C14AD4}.clang_Debug|Win32.Build.0 = clang_Debug|Win32 + {BF458CEF-25D4-4FA5-AFF9-BF4BA4C14AD4}.clang_Debug|x64.ActiveCfg = clang_Debug|x64 + {BF458CEF-25D4-4FA5-AFF9-BF4BA4C14AD4}.clang_Debug|x64.Build.0 = clang_Debug|x64 + {BF458CEF-25D4-4FA5-AFF9-BF4BA4C14AD4}.clang_Release|Win32.ActiveCfg = clang_Release|Win32 + {BF458CEF-25D4-4FA5-AFF9-BF4BA4C14AD4}.clang_Release|Win32.Build.0 = clang_Release|Win32 + {BF458CEF-25D4-4FA5-AFF9-BF4BA4C14AD4}.clang_Release|x64.ActiveCfg = clang_Release|x64 + {BF458CEF-25D4-4FA5-AFF9-BF4BA4C14AD4}.clang_Release|x64.Build.0 = clang_Release|x64 + {BF458CEF-25D4-4FA5-AFF9-BF4BA4C14AD4}.Debug|Win32.ActiveCfg = Debug|Win32 + {BF458CEF-25D4-4FA5-AFF9-BF4BA4C14AD4}.Debug|Win32.Build.0 = Debug|Win32 + {BF458CEF-25D4-4FA5-AFF9-BF4BA4C14AD4}.Debug|x64.ActiveCfg = Debug|x64 + {BF458CEF-25D4-4FA5-AFF9-BF4BA4C14AD4}.Debug|x64.Build.0 = Debug|x64 + {BF458CEF-25D4-4FA5-AFF9-BF4BA4C14AD4}.Release|Win32.ActiveCfg = Release|Win32 + {BF458CEF-25D4-4FA5-AFF9-BF4BA4C14AD4}.Release|Win32.Build.0 = Release|Win32 + {BF458CEF-25D4-4FA5-AFF9-BF4BA4C14AD4}.Release|x64.ActiveCfg = Release|x64 + {BF458CEF-25D4-4FA5-AFF9-BF4BA4C14AD4}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -129,5 +147,6 @@ Global {D0B701B2-9FFB-45DC-A26E-4C9012E0D237} = {8301B3DC-D95E-4277-8614-FE1CF783AB18} {44682BAF-4F62-42D9-90EB-D7F46CD21B95} = {373EF964-F08D-40C8-8543-221ADCE91DE5} {280349E1-6523-4483-97DB-2D16B0716396} = {373EF964-F08D-40C8-8543-221ADCE91DE5} + {BF458CEF-25D4-4FA5-AFF9-BF4BA4C14AD4} = {8301B3DC-D95E-4277-8614-FE1CF783AB18} EndGlobalSection EndGlobal diff --git a/ProjectDxLibEx.vcxproj b/ProjectDxLibEx.vcxproj index f1beb9f..329e3e0 100644 --- a/ProjectDxLibEx.vcxproj +++ b/ProjectDxLibEx.vcxproj @@ -18,6 +18,7 @@ + @@ -61,6 +62,7 @@ + diff --git a/ProjectDxLibEx.vcxproj.filters b/ProjectDxLibEx.vcxproj.filters index e66d8e7..0a1a10d 100644 --- a/ProjectDxLibEx.vcxproj.filters +++ b/ProjectDxLibEx.vcxproj.filters @@ -182,5 +182,11 @@ dxlibex + + dxlibex\basic_types + + + dxlibex\type_traits + \ No newline at end of file diff --git a/dxlibex/basic_types/bel.hpp b/dxlibex/basic_types/bel.hpp index b2a7b78..9c47be7 100644 --- a/dxlibex/basic_types/bel.hpp +++ b/dxlibex/basic_types/bel.hpp @@ -121,7 +121,8 @@ namespace dxle { namespace sound_units { namespace sound_units_literals { inline DXLE_CONSTEXPR deci_bel operator "" _dB(unsigned long long myrioB) { return deci_bel(static_cast(myrioB)); } -} } } -using namespace dxle::sound_units::sound_units_literals; +} +using namespace sound_units_literals; +}} #endif #endif //DXLE_INC_BASIC_TYPES_BEL_HPP_ diff --git a/samples/sound_play/sound_play/main.cpp b/samples/sound_play/sound_play/main.cpp index 7b1d90b..0e46080 100644 --- a/samples/sound_play/sound_play/main.cpp +++ b/samples/sound_play/sound_play/main.cpp @@ -4,6 +4,7 @@ int WINAPI WinMain(HINSTANCE /*hInstance*/, HINSTANCE /*hPrevInstance*/, LPSTR /*lpCmdLine*/, int /*nCmdShow*/) { //SetCreateSoundPitchRate(100); #ifdef DXLE_SUPPORT_CXX11_USER_DEFINED_LITERALS + using namespace dxle::sound_units_literals; constexpr auto rate = 300_dB; constexpr auto rate2 = 4000_myrioB; constexpr auto rate3 = dxle::bel_cast(rate);