#37799 Win10でのSoundDeviceの初期値を、WASAPI共有に変更。(DTXMania本体並びに、DTXCreatorからのDTXMania Viewe...

#xxxxx app.configの修正は自動でRuntimeResourcesに反映されるが、それをリポジトリに投入し忘れていたので対応。

diff --git a/DTXCreator/app.config b/DTXCreator/app.config
index aeb3aa8..7e2a023 100644 (file)
--- a/DTXCreator/app.config
+++ b/DTXCreator/app.config
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <configuration>
   <startup useLegacyV2RuntimeActivationPolicy="true">
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/>
     <supportedRuntime version="v2.0.50727"/>
     <supportedRuntime version="v1.1.4322"/>
     <supportedRuntime version="v1.0.3705"/>
@@ -14,4 +14,3 @@
     </assemblyBinding>
   </runtime>
 </configuration>
-

diff --git a/DTXCreator/コード/00.全体/AppSetting.cs b/DTXCreator/コード/00.全体/AppSetting.cs
index 44fdf3c..e12a3e1 100644 (file)
--- 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 e1a8fe5..0904b2c 100644 (file)
--- a/DTXMania/app.config
+++ b/DTXMania/app.config
@@ -8,9 +8,9 @@
   </startup>
 
   <runtime>
-  <loadFromRemoteSources enabled="true"/>
-  <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-               <probing privatePath="dll"/>
-      </assemblyBinding>
+    <loadFromRemoteSources enabled="true"/>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+                 <probing privatePath="dll"/>
+    </assemblyBinding>
        </runtime>
 </configuration>

diff --git a/DTXMania/コード/ステージ/04.コンフィグ/CConfigXml.cs b/DTXMania/コード/ステージ/04.コンフィグ/CConfigXml.cs
index 7fdb950..661783b 100644 (file)
--- 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<ESoundDeviceTypeForConfig>(FDK.COS.bIsVistaOrLater ? ESoundDeviceTypeForConfig.WASAPI_Exclusive : ESoundDeviceTypeForConfig.DSound);
+                       nSoundDeviceType = new COptionEnum<ESoundDeviceTypeForConfig>(
+                               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 aeb3aa8..7e2a023 100644 (file)
--- a/RuntimeResources/DTXCreator.exe.config
+++ b/RuntimeResources/DTXCreator.exe.config
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <configuration>
   <startup useLegacyV2RuntimeActivationPolicy="true">
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/>
     <supportedRuntime version="v2.0.50727"/>
     <supportedRuntime version="v1.1.4322"/>
     <supportedRuntime version="v1.0.3705"/>
@@ -14,4 +14,3 @@
     </assemblyBinding>
   </runtime>
 </configuration>
-

diff --git a/RuntimeResources/DTXManiaGR.exe.config b/RuntimeResources/DTXManiaGR.exe.config
index 9118e0f..08c1243 100644 (file)
--- a/RuntimeResources/DTXManiaGR.exe.config
+++ b/RuntimeResources/DTXManiaGR.exe.config
@@ -8,9 +8,9 @@
   </startup>\r
 \r
   <runtime>\r
-  <loadFromRemoteSources enabled="true"/>\r
-  <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">\r
-               <probing privatePath="dll"/>\r
-      </assemblyBinding>\r
+    <loadFromRemoteSources enabled="true"/>\r
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">\r
+                 <probing privatePath="dll"/>\r
+    </assemblyBinding>\r
        </runtime>\r
 </configuration>\r