#xxxxx WAASPI排他だけでなく、WASAPI共有を選べるよう、以前の仕様に戻した。今後のWin10 WASAPI共有対応への布石。なおこれに伴いSoundDev...

[dtxmania/dtxmania.git] / DTXManiaプロジェクト / コード / ステージ / 04.コンフィグ / CConfigXml.cs

diff --git a/DTXManiaプロジェクト/コード/ステージ/04.コンフィグ/CConfigXml.cs b/DTXManiaプロジェクト/コード/ステージ/04.コンフィグ/CConfigXml.cs
index 6c188cc..b1f8373 100644 (file)
--- a/DTXManiaプロジェクト/コード/ステージ/04.コンフィグ/CConfigXml.cs
+++ b/DTXManiaプロジェクト/コード/ステージ/04.コンフィグ/CConfigXml.cs
@@ -5,6 +5,8 @@ using System.Diagnostics;
 using System;\r
 using FDK;\r
 \r
+using SlimDXKey = SlimDX.DirectInput.Key;\r
+\r
 namespace DTXMania\r
 {\r
        /// <summary>\r
@@ -485,6 +487,7 @@ namespace DTXMania
                        {\r
                                bAutoPlay[ pad ] = new COptionBool( true );\r
                        }\r
+                       bAutoPlay[ EPad.Capture ] = new COptionBool( true );\r
                        bViewerVSyncWait = new COptionBool( true );\r
                        bViewerShowDebugStatus = new COptionBool(true);\r
                        bViewerTimeStretch = new COptionBool(false);\r
@@ -500,7 +503,7 @@ namespace DTXMania
                        bUseOSTimer = new COptionBool(false);\r
                        bDynamicBassMixerManagement = new COptionBool(true);\r
                        bTimeStretch = new COptionBool(false);\r
-                       nSoundDeviceType = new COptionEnum<ESoundDeviceTypeForConfig>(FDK.COS.bIsVistaOrLater ? ESoundDeviceTypeForConfig.WASAPI : ESoundDeviceTypeForConfig.DSound);\r
+                       nSoundDeviceType = new COptionEnum<ESoundDeviceTypeForConfig>(FDK.COS.bIsVistaOrLater ? ESoundDeviceTypeForConfig.WASAPI_Exclusive : ESoundDeviceTypeForConfig.DSound);\r
                        bForceHighPowerPlan = new COptionBool( false );\r
                        bEventDrivenWASAPI = new COptionBool( false );\r
                        bLoadDTXDetail = new COptionBool( false ); \r
@@ -514,12 +517,12 @@ namespace DTXMania
                        // enum\r
                        eDamageLevel = new COptionEnum<EDamage>(EDamage.Normal);\r
                        eJudgePriority = new COptionEnum<EJudgeDisplayPriority>(EJudgeDisplayPriority.Under);\r
-                       eCYGroup = new COptionEnum<ECYGroup>(ECYGroup.None);\r
+                       eCYGroup = new COptionEnum<ECYGroup>(ECYGroup.Off);\r
                        eDark = new COptionEnum<EDark>(EDark.Off);\r
-                       eFTGroup = new COptionEnum<EFTGroup>(EFTGroup.None);\r
-                       eHHGroup = new COptionEnum<EHHGroup>(EHHGroup.None);\r
-                       eBDGroup = new COptionEnum<EBDGroup>(EBDGroup.None);\r
-                       Backup1BDHHGroup = new COptionEnum<EHHGroup>(EHHGroup.None);\r
+                       eFTGroup = new COptionEnum<EFTGroup>(EFTGroup.Off);\r
+                       eHHGroup = new COptionEnum<EHHGroup>(EHHGroup.Off);\r
+                       eBDGroup = new COptionEnum<EBDGroup>(EBDGroup.Off);\r
+                       Backup1BDHHGroup = new COptionEnum<EHHGroup>(EHHGroup.Off);\r
                        Backup1BDPriotiry = new COptionEnum<EHitSoundPriority>(EHitSoundPriority.Chip);\r
                        eHitSoundPriorityCY = new COptionEnum<EHitSoundPriority>(EHitSoundPriority.Chip);\r
                        eHitSoundPriorityFT = new COptionEnum<EHitSoundPriority>(EHitSoundPriority.Chip);\r
@@ -756,6 +759,7 @@ namespace DTXMania
                        bAutoPlay.BsB.Initialize( "strCfgBsAutoB" );\r
                        bAutoPlay.BsPick.Initialize( "strCfgBsAutoPick" );\r
                        bAutoPlay.BsWail.Initialize( "strCfgBsAutoWailing" );\r
+                       bAutoPlay.Capture.Initialize( "strCfgCapture" );\r
 \r
                        bLoadSoundSpeed.Initialize( "strCfgSysSoundLoadLimiter" );\r
                        bIsAutoResultCapture.Initialize( "strCfgSysAutoResultCapture" );\r
@@ -813,7 +817,7 @@ namespace DTXMania
                        // integer\r
                        nSleepPerFrameMs.Initialize( "strCfgSysSleepPerFrame", -1, 33 );\r
                        nSleepUnfocusMs.Initialize( "strCfgSysSleepUnfocus", 0, 33 );\r
-                       nBGAlpha.Initialize( "strCfgSysBGAAlpha", 0, 255 );\r
+                       nBGAlpha.Initialize( "strCfgSysBGAAlpha", 0, 256 );\r
                        nPreSoundWeightMs.Initialize( "strCfgSysPreSoundWait", 0, 10001);\r
                        nPreImageWeightMs.Initialize( "strCfgSysPreImageWait", 0, 10001);\r
                        nFontSizeDotSongSelect.Initialize("", "", 5);\r
@@ -971,7 +975,7 @@ namespace DTXMania
                                        Backup1BDPriotiry.Value = eHitSoundPriorityHH;\r
 \r
                                        // HH Group ... HH-0 → HH-2 / HH-1 → HH-3 / HH-2 → 変更なし / HH-3 → 変更なし\r
-                                       if (eHHGroup == EHHGroup.None)\r
+                                       if (eHHGroup == EHHGroup.Off)\r
                                        {\r
                                                eHHGroup.Value = EHHGroup.LC_HH;\r
                                        }\r
@@ -1007,7 +1011,7 @@ namespace DTXMania
                                while ( \r
                                                ( CDTXMania.Instance.Pad.bDecidePadIsPressedDGB() ||\r
                                                        ( CDTXMania.Instance.ConfigIni.bEnterがキー割り当てのどこにも使用されていない &&\r
-                                                         CDTXMania.Instance.Input管理.Keyboard.bキーが押された( (int) SlimDX.DirectInput.Key.Return )\r
+                                                         CDTXMania.Instance.Input管理.Keyboard.bキーが押された( (int) SlimDXKey.Return )\r
                                                        )\r
                                                )\r
                                          )\r
@@ -1038,7 +1042,7 @@ namespace DTXMania
                                        for (int k = 0; k < AssignableCodes; k++)\r
                                        {\r
                                                if ((KeyAssign[j][k].入力デバイス == EInputDevice.Keyboard) &&\r
-                                                               (KeyAssign[j][k].コード == (int)SlimDX.DirectInput.Key.Return))\r
+                                                               (KeyAssign[j][k].コード == (int)SlimDXKey.Return))\r
                                                {\r
                                                        return false;\r
                                                }\r
@@ -1291,7 +1295,8 @@ namespace DTXMania
                                }\r
                        }\r
                }\r
-const string strDefaultKeyAssign = @"\r
+\r
+               const string strDefaultKeyAssign = @"\r
 HH=K035,M042,M093\r
 SD=K033,M025,M026,M027,M028,M029,M031,M032,M034,M037,M038,M040,M0113\r
 BD=K012,K0126,M033,M035,M036,M0112\r
@@ -1307,15 +1312,15 @@ HP=M044
 GtR=K055\r
 GtG=K056,J012\r
 GtB=K057\r
-GtPick=K0115,K046,J06\r
+GtPick=K0115,K046\r
 GtWail=K0116\r
 GtDecide=K060\r
 GtCancel=K061\r
 \r
 BsR=K090\r
-BsG=K091,J013\r
+BsG=K091\r
 BsB=K092\r
-BsPick=K0103,K0100,J08\r
+BsPick=K0103,K0100\r
 BsWail=K089\r
 BsDecide=K096\r
 BsCancel=K097\r