From 4401c8f4b29b3ae8909c601e5211057cc36b288e Mon Sep 17 00:00:00 2001 From: yyagi Date: Wed, 13 Dec 2017 23:57:23 +0900 Subject: [PATCH] =?utf8?q?#37799=20Win10=E3=81=A7=E3=81=AESoundDevice?= =?utf8?q?=E3=81=AE=E5=88=9D=E6=9C=9F=E5=80=A4=E3=82=92=E3=80=81WASAPI?= =?utf8?q?=E5=85=B1=E6=9C=89=E3=81=AB=E5=A4=89=E6=9B=B4=E3=80=82(DTXMania?= =?utf8?q?=E6=9C=AC=E4=BD=93=E4=B8=A6=E3=81=B3=E3=81=AB=E3=80=81DTXCreator?= =?utf8?q?=E3=81=8B=E3=82=89=E3=81=AEDTXMania=20Viewer=E5=91=BC=E3=81=B3?= =?utf8?q?=E5=87=BA=E3=81=97=E3=81=AB=E3=81=8A=E3=81=84=E3=81=A6)=20#xxxxx?= =?utf8?q?=20app.config=E3=81=AE=E4=BF=AE=E6=AD=A3=E3=81=AF=E8=87=AA?= =?utf8?q?=E5=8B=95=E3=81=A7RuntimeResources=E3=81=AB=E5=8F=8D=E6=98=A0?= =?utf8?q?=E3=81=95=E3=82=8C=E3=82=8B=E3=81=8C=E3=80=81=E3=81=9D=E3=82=8C?= =?utf8?q?=E3=82=92=E3=83=AA=E3=83=9D=E3=82=B8=E3=83=88=E3=83=AA=E3=81=AB?= =?utf8?q?=E6=8A=95=E5=85=A5=E3=81=97=E5=BF=98=E3=82=8C=E3=81=A6=E3=81=84?= =?utf8?q?=E3=81=9F=E3=81=AE=E3=81=A7=E5=AF=BE=E5=BF=9C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- DTXCreator/app.config | 3 +-- DTXCreator/コード/00.全体/AppSetting.cs | 4 +++- DTXMania/app.config | 8 ++++---- DTXMania/コード/ステージ/04.コンフィグ/CConfigXml.cs | 6 +++++- RuntimeResources/DTXCreator.exe.config | 3 +-- RuntimeResources/DTXManiaGR.exe.config | 8 ++++---- 6 files changed, 18 insertions(+), 14 deletions(-) diff --git a/DTXCreator/app.config b/DTXCreator/app.config index aeb3aa8c..7e2a0233 100644 --- a/DTXCreator/app.config +++ b/DTXCreator/app.config @@ -1,7 +1,7 @@ - + @@ -14,4 +14,3 @@ - diff --git a/DTXCreator/コード/00.全体/AppSetting.cs b/DTXCreator/コード/00.全体/AppSetting.cs index 44fdf3cd..e12a3e19 100644 --- a/DTXCreator/コード/00.全体/AppSetting.cs +++ b/DTXCreator/コード/00.全体/AppSetting.cs @@ -425,7 +425,9 @@ namespace DTXCreator PlayStartOption = "-N-1"; PlayStopOption = "-S"; //SoundType = (FDK.COS.bIsVistaOrLater)? ViewerSoundType.WASAPI : ViewerSoundType.DirectSound; - SoundType = ( FDK.COS.bIsVistaOrLater ) ? FDK.ESoundDeviceType.ExclusiveWASAPI : FDK.ESoundDeviceType.DirectSound; + SoundType = ( FDK.COS.bIsVistaOrLater ) ? + ( ( FDK.COS.bIsWin10OrLater ) ? FDK.ESoundDeviceType.SharedWASAPI : FDK.ESoundDeviceType.ExclusiveWASAPI ) + : FDK.ESoundDeviceType.DirectSound; ASIODeviceNo = 0; GRmode = false; TimeStretch = false; diff --git a/DTXMania/app.config b/DTXMania/app.config index e1a8fe5c..0904b2ca 100644 --- a/DTXMania/app.config +++ b/DTXMania/app.config @@ -8,9 +8,9 @@ - - - - + + + + diff --git a/DTXMania/コード/ステージ/04.コンフィグ/CConfigXml.cs b/DTXMania/コード/ステージ/04.コンフィグ/CConfigXml.cs index 7fdb9509..661783bc 100644 --- a/DTXMania/コード/ステージ/04.コンフィグ/CConfigXml.cs +++ b/DTXMania/コード/ステージ/04.コンフィグ/CConfigXml.cs @@ -503,7 +503,11 @@ namespace DTXMania bUseOSTimer = new COptionBool(false); bDynamicBassMixerManagement = new COptionBool(true); bTimeStretch = new COptionBool(false); - nSoundDeviceType = new COptionEnum(FDK.COS.bIsVistaOrLater ? ESoundDeviceTypeForConfig.WASAPI_Exclusive : ESoundDeviceTypeForConfig.DSound); + nSoundDeviceType = new COptionEnum( + FDK.COS.bIsVistaOrLater ? + (FDK.COS.bIsWin10OrLater? ESoundDeviceTypeForConfig.WASAPI_Shared : ESoundDeviceTypeForConfig.WASAPI_Exclusive) + : ESoundDeviceTypeForConfig.DSound + ); bForceHighPowerPlan = new COptionBool( false ); bEventDrivenWASAPI = new COptionBool( false ); bLoadDTXDetail = new COptionBool( false ); diff --git a/RuntimeResources/DTXCreator.exe.config b/RuntimeResources/DTXCreator.exe.config index aeb3aa8c..7e2a0233 100644 --- a/RuntimeResources/DTXCreator.exe.config +++ b/RuntimeResources/DTXCreator.exe.config @@ -1,7 +1,7 @@ - + @@ -14,4 +14,3 @@ - diff --git a/RuntimeResources/DTXManiaGR.exe.config b/RuntimeResources/DTXManiaGR.exe.config index 9118e0f8..08c12430 100644 --- a/RuntimeResources/DTXManiaGR.exe.config +++ b/RuntimeResources/DTXManiaGR.exe.config @@ -8,9 +8,9 @@ - - - - + + + + -- 2.11.0