OSDN Git Service

#xxxxx WAASPI排他だけでなく、WASAPI共有を選べるよう、以前の仕様に戻した。今後のWin10 WASAPI共有対応への布石。なおこれに伴いSoundDev...
[dtxmania/dtxmania.git] / DTXManiaプロジェクト / コード / ステージ / 04.コンフィグ / CConfigXml.cs
index af5fc2f..b1f8373 100644 (file)
@@ -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
@@ -37,7 +39,7 @@ namespace DTXMania
        /// ・CActConfigList で新しく追加した項目を list に追加してください。\r
        /// </summary>\r
        [DataContract]\r
-       public class CConfigXml : IExtensibleDataObject\r
+       public class CConfigXml : IExtensibleDataObject, ICloneable\r
        {\r
                public static readonly int AssignableCodes = 16;\r
 \r
@@ -59,6 +61,16 @@ namespace DTXMania
                        }\r
                }\r
 \r
+               /// <summary>\r
+               /// とりあえずshallow copyによるClone()。\r
+               /// </summary>\r
+               /// <returns>自身を複製したCConfigXmlクラス。</returns>\r
+               public object Clone()\r
+               {\r
+                       return (CConfigXml) MemberwiseClone();\r
+               }\r
+\r
+\r
                [DataMember]\r
                public COptionBool bFullAVI;\r
                [DataMember]\r
@@ -154,13 +166,22 @@ namespace DTXMania
                // 言語設定\r
                public COptionString strLanguage;\r
        //      public COptionStringList strLanguageList;\r
+               \r
+               // #36177 2016.7.30 ikanick\r
+               [DataMember( Order = 105 )]\r
+               public COptionBool bLoadDTXDetail;\r
 \r
                [DataMember]\r
                public COptionInteger nBGAlpha;\r
                [DataMember]\r
                public Coordinates.CRect rcWindow;\r
+\r
+               public Coordinates.CRect rcWindow_backup;                       // Viewerとしての使用時は、Playerとして使用する際のウインドウ情報をバックアップしておき、終了時に復元する\r
+                                                                                                                       // 内部保持するだけの情報であるため、Config.xmlに保存する必要はなく、[DataMember]は不要\r
+\r
                [DataMember]\r
                public Coordinates.CRect rcViewerWindow;\r
+               \r
                [DataMember]\r
                public COptionInteger nMasterVolume;\r
                [DataMember]\r
@@ -192,7 +213,7 @@ namespace DTXMania
                // #28228 2012.5.1 yyagi レーン毎の最大同時発音数 \r
                // #24820 2013.1.15 yyagi 初期値を4から2に変更。BASS.net使用時の負荷軽減のため。\r
                // #24820 2013.1.17 yyagi 初期値を4に戻した。動的なミキサー制御がうまく動作しているため。\r
-               public COptionInteger nPoliphonicSounds;\r
+               public COptionInteger nPolyphonicSounds;\r
                [DataMember]\r
                // #24820 2013.1.15 yyagi WASAPIのバッファサイズ 初期値は50(0で自動設定)\r
                public COptionInteger nWASAPIBufferSizeMs;\r
@@ -248,6 +269,14 @@ namespace DTXMania
                // #24820 2013.1.17 yyagi ASIOデバイス\r
                public COptionStringList strASIODevice;\r
 \r
+               [DataMember( Order = 106 )]\r
+               public COptionEnum<EClickType> eClickType;\r
+               [DataMember( Order = 106 )]\r
+               public COptionInteger nClickHighVolume;\r
+               [DataMember( Order = 106 )]\r
+               public COptionInteger nClickLowVolume;\r
+\r
+\r
                [DataMember]\r
                public STDGBSValue<COptionBool> bLight;\r
                [DataMember]\r
@@ -298,6 +327,8 @@ namespace DTXMania
                [DataMember]\r
                public STDGBSValue<COptionBool> bDisplayJudge;\r
 \r
+\r
+       \r
                /// <summary>\r
                /// 楽器左端座標。ここを基準に各パーツを配置する。\r
                /// </summary>\r
@@ -432,7 +463,7 @@ namespace DTXMania
                        bAVI = new COptionBool(true);\r
                        bBGA = new COptionBool(true);\r
                        bFillin = new COptionBool(true);\r
-                       bLogDTX = new COptionBool(true);\r
+                       bLogDTX = new COptionBool(false);\r
                        bLogEnumerateSongs = new COptionBool(false);\r
                        bLogCreateRelease = new COptionBool(false);\r
                        bCymbalFree = new COptionBool(false);\r
@@ -448,11 +479,16 @@ namespace DTXMania
                        bDebugInfo = new COptionBool(false);\r
                        bLog = new COptionBool(true);\r
                        bAutoPlay = new COptionPadBool();\r
-                       for (EPad pad = EPad.Min; pad < EPad.Max; ++pad)\r
+                       for ( EPad pad = EPad.DrumsPadMin; pad < EPad.DrumsPadMax; ++pad )\r
                        {\r
-                               bAutoPlay[pad] = new COptionBool(false);\r
+                               bAutoPlay[ pad ] = new COptionBool( false );\r
                        }\r
-                       bViewerVSyncWait = new COptionBool(true);\r
+                       for ( EPad pad = EPad.GuitarPadMin; pad < EPad.BassPadMax; ++pad )\r
+                       {\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
                        bViewerDrumsActive = new COptionBool(true);\r
@@ -467,9 +503,10 @@ 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
 \r
                        // string\r
                        strSongDataPath = new COptionString(@".\");\r
@@ -480,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
@@ -496,7 +533,8 @@ namespace DTXMania
 \r
                        // integer\r
                        rcWindow = new Coordinates.CRect(100, 100, 1280, 720);\r
-                       nSleepPerFrameMs = new COptionInteger(-1);\r
+                       rcWindow_backup = new Coordinates.CRect( 100, 100, 1280, 720 );\r
+                       nSleepPerFrameMs = new COptionInteger( -1 );\r
                        nSleepUnfocusMs = new COptionInteger(1);\r
                        nBGAlpha = new COptionInteger(100);\r
                        nPreSoundWeightMs = new COptionInteger(1000);\r
@@ -518,13 +556,18 @@ namespace DTXMania
                                nVelocityMin[pad] = new COptionInteger(0);\r
                        }\r
                        nVelocityMin.HH.Value = 20;\r
+\r
                        nRisky = new COptionInteger(0);\r
                        nWASAPIBufferSizeMs = new COptionInteger(50);\r
                        nChipDisplayTimeMs = new COptionInteger(3000);\r
                        nChipFadeoutTimeMs = new COptionInteger(2000);\r
-                       rcViewerWindow = new Coordinates.CRect(100, 100, 1280, 720);\r
+                       rcViewerWindow = new Coordinates.CRect(100, 100, 640, 360);\r
                        nMasterVolume = new COptionInteger(100);\r
-                       nPoliphonicSounds = new COptionInteger(4);\r
+                       nPolyphonicSounds = new COptionInteger(4);\r
+\r
+                       eClickType = new COptionEnum<EClickType>(EClickType.Off);\r
+                       nClickHighVolume = new COptionInteger(100);\r
+                       nClickLowVolume = new COptionInteger(100);\r
 \r
                        // dgb\r
                        bEmphasizePlaySound = new STDGBSValue<COptionBool>();\r
@@ -659,12 +702,14 @@ namespace DTXMania
                        cdLaneOrder.FT.Value = 6;\r
                        cdLaneOrder.CY.Value = 7;\r
 \r
+                       cdLaneOrder.GtR.Value = 0;\r
                        cdLaneOrder.GtG.Value = 1;\r
                        cdLaneOrder.GtB.Value = 2;\r
                        cdLaneOrder.GtW.Value = 3;\r
 \r
+                       cdLaneOrder.BsR.Value = 0;\r
                        cdLaneOrder.BsG.Value = 1;\r
-                       cdLaneOrder.BsR.Value = 2;\r
+                       cdLaneOrder.GtB.Value = 2;\r
                        cdLaneOrder.BsW.Value = 3;\r
 \r
                        bConfigIniが存在している = System.IO.File.Exists(CDTXMania.Instance.strEXEのあるフォルダ + "Config.xml");\r
@@ -681,53 +726,55 @@ namespace DTXMania
                {\r
                        // ラベル・説明文・上下限値\r
                        CResources cr = CDTXMania.Instance.Resources;\r
-                       bFullScreen.Initialize( cr.Label("strCfgSysFullScreen"), cr.Explanation("strCfgSysFullScreen") );\r
-                       bVSyncWait.Initialize( cr.Label("strCfgSysVSync"), cr.Explanation("strCfgSysVSync") );\r
-                       bStageFailed.Initialize( cr.Label("strCfgSysStageFailed"), cr.Explanation("strCfgSysStageFailed") );\r
-                       bFullAVI.Initialize( cr.Label("strCfgSysFullAVI"), cr.Explanation("strCfgSysFullAVI") );\r
-                       bAVI.Initialize( cr.Label("strCfgSysAVI"), cr.Explanation("strCfgSysAVI") );\r
-                       bBGA.Initialize( cr.Label("strCfgSysBGA"), cr.Explanation("strCfgSysBGA" ) );\r
-                       bLog.Initialize( cr.Label("strCfgSysLog"), cr.Explanation("strCfgSysLog") );\r
-                       bStoicMode.Initialize( cr.Label("strCfgSysStoic"), cr.Explanation("strCfgSysStoic") );\r
-                       bWaveAdjust.Initialize( cr.Label("strCfgSysAdjustWaves"), cr.Explanation("strCfgSysAdjustWaves") );\r
-                       bBGMPlay.Initialize( cr.Label("strCfgSysBGM"), cr.Explanation("strCfgSysBGM") );\r
-                       bAudience.Initialize( cr.Label("strCfgSysAudience"), cr.Explanation("strCfgSysAudience") );\r
-                       bScoreIni.Initialize( cr.Label("strCfgSysSaveScoreIni"), cr.Explanation("strCfgSysSaveScoreIni") );\r
-                       bRandSubBox.Initialize( cr.Label("strCfgSysRandSubBox"), cr.Explanation("strCfgSysRandSubBox") );\r
-                       bAutoPlay.HH.Initialize( cr.Label("strCfgDrAutoHHC"), cr.Explanation("strCfgDrAutoHHC") );\r
-                       bAutoPlay.HHO.Initialize( cr.Label("strCfgDrAutoHHO"), cr.Explanation("strCfgDrAutoHHO") );\r
-                       bAutoPlay.SD.Initialize( cr.Label("strCfgDrAutoSD"), cr.Explanation("strCfgDrAutoSD") );\r
-                       bAutoPlay.BD.Initialize( cr.Label("strCfgDrAutoBD"), cr.Explanation("strCfgDrAutoBD") );\r
-                       bAutoPlay.HT.Initialize( cr.Label("strCfgDrAutoHT"), cr.Explanation("strCfgDrAutoHT") );\r
-                       bAutoPlay.LT.Initialize( cr.Label("strCfgDrAutoLT"), cr.Explanation("strCfgDrAutoLT") );\r
-                       bAutoPlay.FT.Initialize( cr.Label("strCfgDrAutoFT"), cr.Explanation("strCfgDrAutoFT") );\r
-                       bAutoPlay.CY.Initialize( cr.Label("strCfgDrAutoCY"), cr.Explanation("strCfgDrAutoCY") );\r
-                       bAutoPlay.RD.Initialize( cr.Label("strCfgDrAutoRD"), cr.Explanation("strCfgDrAutoRD") );\r
-                       bAutoPlay.LC.Initialize( cr.Label("strCfgDrAutoLCY"), cr.Explanation("strCfgDrAutoLCY") );\r
-                       bAutoPlay.GtR.Initialize( cr.Label( "strCfgGtAutoR" ), cr.Explanation( "strCfgGtAutoR" ) );\r
-                       bAutoPlay.GtG.Initialize( cr.Label( "strCfgGtAutoG" ), cr.Explanation( "strCfgGtAutoG" ) );\r
-                       bAutoPlay.GtB.Initialize( cr.Label( "strCfgGtAutoB" ), cr.Explanation( "strCfgGtAutoB" ) );\r
-                       bAutoPlay.GtPick.Initialize( cr.Label( "strCfgGtAutoPick" ), cr.Explanation( "strCfgGtAutoPick" ) );\r
-                       bAutoPlay.GtWail.Initialize( cr.Label( "strCfgGtAutoWailing" ), cr.Explanation( "strCfgGtAutoWailing" ) );\r
-                       bAutoPlay.BsR.Initialize( cr.Label( "strCfgBsAutoR" ), cr.Explanation( "strCfgBsAutoR" ) );\r
-                       bAutoPlay.BsG.Initialize( cr.Label( "strCfgBsAutoG" ), cr.Explanation( "strCfgBsAutoG" ) );\r
-                       bAutoPlay.BsB.Initialize( cr.Label( "strCfgBsAutoB" ), cr.Explanation( "strCfgBsAutoB" ) );\r
-                       bAutoPlay.BsPick.Initialize( cr.Label( "strCfgBsAutoPick" ), cr.Explanation( "strCfgBsAutoPick" ) );\r
-                       bAutoPlay.BsWail.Initialize( cr.Label( "strCfgBsAutoWailing" ), cr.Explanation( "strCfgBsAutoWailing" ) );\r
-\r
-                       bLoadSoundSpeed.Initialize( cr.Label("strCfgSysSoundLoadLimiter"), cr.Explanation("strCfgSysSoundLoadLimiter") );\r
-                       bIsAutoResultCapture.Initialize( cr.Label("strCfgSysAutoResultCapture"), cr.Explanation("strCfgSysAutoResultCapture") );\r
-                       bBufferedInput.Initialize( cr.Label("strCfgSysBufferingInput"), cr.Explanation("strCfgSysBufferingInput") );\r
-                       bUseBoxDefSkin.Initialize( cr.Label("strCfgSysUseBoxDefSkin"), cr.Explanation("strCfgSysUseBoxDefSkin") );\r
-                       bUseOSTimer.Initialize( cr.Label("strCfgSysUseOSTimer"), cr.Explanation("strCfgSysUseOSTimer") );\r
-                       bTimeStretch.Initialize( cr.Label("strCfgSysTimeStretch"),  cr.Explanation("strCfgSysTimeStretch") );\r
-                       bForceHighPowerPlan.Initialize( cr.Label("strCfgSysForceHighPowerPlan"), cr.Explanation("strCfgSysForceHighPowerPlan") );\r
-                       bEventDrivenWASAPI.Initialize( cr.Label("strCfgSysWASAPIEventDriven"), cr.Explanation("strCfgSysWASAPIEventDriven") );\r
-\r
-                       bCymbalFree.Initialize( cr.Label("strCfgDrCymbalFree"), cr.Explanation("strCfgDrCymbalFree") );\r
-                       bDrumsHitSound.Initialize( cr.Label("strCfgDrChipSound"), cr.Explanation("strCfgDrChipSound") );\r
-                       bFillin.Initialize( cr.Label("strCfgDrFillin"), cr.Explanation("strCfgDrFillin") );\r
-                       bTight.Initialize( cr.Label("strCfgDrTight"), cr.Explanation("strCfgDrTight") );\r
+                       bFullScreen.Initialize( "strCfgSysFullScreen" );\r
+                       bVSyncWait.Initialize( "strCfgSysVSync" );\r
+                       bStageFailed.Initialize( "strCfgSysStageFailed");\r
+                       bFullAVI.Initialize( "strCfgSysFullAVI" );\r
+                       bAVI.Initialize( "strCfgSysAVI" );\r
+                       bBGA.Initialize( "strCfgSysBGA" );\r
+                       bLog.Initialize( "strCfgSysLog" );\r
+                       bStoicMode.Initialize( "strCfgSysStoic" );\r
+                       bWaveAdjust.Initialize( "strCfgSysAdjustWaves" );\r
+                       bBGMPlay.Initialize( "strCfgSysBGM" );\r
+                       bAudience.Initialize( "strCfgSysAudience" );\r
+                       bScoreIni.Initialize( "strCfgSysSaveScoreIni" );\r
+                       bRandSubBox.Initialize( "strCfgSysRandSubBox" );\r
+                       bAutoPlay.HH.Initialize( "strCfgDrAutoHHC" );\r
+                       bAutoPlay.HHO.Initialize( "strCfgDrAutoHHO" );\r
+                       bAutoPlay.SD.Initialize( "strCfgDrAutoSD" );\r
+                       bAutoPlay.BD.Initialize( "strCfgDrAutoBD" );\r
+                       bAutoPlay.HT.Initialize( "strCfgDrAutoHT" );\r
+                       bAutoPlay.LT.Initialize( "strCfgDrAutoLT" );\r
+                       bAutoPlay.FT.Initialize( "strCfgDrAutoFT" );\r
+                       bAutoPlay.CY.Initialize( "strCfgDrAutoCY" );\r
+                       bAutoPlay.RD.Initialize( "strCfgDrAutoRD" );\r
+                       bAutoPlay.LC.Initialize( "strCfgDrAutoLCY" );\r
+                       bAutoPlay.GtR.Initialize( "strCfgGtAutoR" );\r
+                       bAutoPlay.GtG.Initialize( "strCfgGtAutoG" );\r
+                       bAutoPlay.GtB.Initialize( "strCfgGtAutoB" );\r
+                       bAutoPlay.GtPick.Initialize( "strCfgGtAutoPick" );\r
+                       bAutoPlay.GtWail.Initialize( "strCfgGtAutoWailing" );\r
+                       bAutoPlay.BsR.Initialize( "strCfgBsAutoR" );\r
+                       bAutoPlay.BsG.Initialize( "strCfgBsAutoG" );\r
+                       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
+                       bBufferedInput.Initialize( "strCfgSysBufferingInput" );\r
+                       bUseBoxDefSkin.Initialize( "strCfgSysUseBoxDefSkin" );\r
+                       bUseOSTimer.Initialize( "strCfgSysUseOSTimer" );\r
+                       bTimeStretch.Initialize( "strCfgSysTimeStretch" );\r
+                       bForceHighPowerPlan.Initialize( "strCfgSysForceHighPowerPlan" );\r
+                       bEventDrivenWASAPI.Initialize( "strCfgSysWASAPIEventDriven" );\r
+                       bLoadDTXDetail.Initialize( "strCfgSysLoadDTXDetail" ); // #36177 2016.7.30 ikanick\r
+\r
+                       bCymbalFree.Initialize( "strCfgDrCymbalFree" );\r
+                       bDrumsHitSound.Initialize( "strCfgDrChipSound" );\r
+                       bFillin.Initialize( "strCfgDrFillin" );\r
+                       bTight.Initialize( "strCfgDrTight" );\r
 \r
                        bItalicFontSongSelect.Initialize("", "");\r
                        bBoldFontSongSelect.Initialize("", "");\r
@@ -742,154 +789,159 @@ namespace DTXMania
                        bIsAllowedDoubleClickFullscreen.Initialize("", "");\r
                        bIsEnabledSystemMenu.Initialize("", "");\r
                        bDynamicBassMixerManagement.Initialize("", "");\r
-                       bDebugInfo.Initialize( cr.Label("strCfgSysDebugInfo"), cr.Explanation("strCfgSysDebugInfo") );\r
+                       bDebugInfo.Initialize( "strCfgSysDebugInfo" );\r
 \r
                        // enum\r
-                       nSoundDeviceType.Initialize( cr.Label("strCfgSysSoundDeviceType"), cr.Explanation("strCfgSysSoundDeviceType"), typeof(ESoundDeviceTypeForConfig));\r
-                       eDamageLevel.Initialize( cr.Label("strCfgSysDamageLevel"), cr.Explanation("strCfgSysDamageLevel"), typeof(EDamage));\r
-                       eJudgePriority.Initialize( cr.Label("strCfgSysJudgePriority"), cr.Explanation("strCfgSysJudgePriority"), typeof(EJudgeDisplayPriority));\r
-                       eCYGroup.Initialize( cr.Label("strCfgDrCYGroup"), cr.Explanation("strCfgDrCYGroup"), typeof(ECYGroup));\r
-                       eDark.Initialize( cr.Label("strCfgSysDark"), cr.Explanation("strCfgSysDark"), typeof(EDark));\r
-                       eFTGroup.Initialize( cr.Label("strCfgDrFTGroup"), cr.Explanation("strCfgDrFTGroup"), typeof(EFTGroup));\r
-                       eHHGroup.Initialize( cr.Label("strCfgDrHHGroup"), cr.Explanation("strCfgDrHHGroup"), typeof(EHHGroup));\r
-                       eBDGroup.Initialize( cr.Label("strCfgDrBDGroup"), cr.Explanation("strCfgDrBDGroup"), typeof(EBDGroup));\r
+                       nSoundDeviceType.Initialize( "strCfgSysSoundDeviceType", typeof(ESoundDeviceTypeForConfig));\r
+                       eDamageLevel.Initialize( "strCfgSysDamageLevel", typeof(EDamage));\r
+                       eJudgePriority.Initialize( "strCfgSysJudgePriority", typeof(EJudgeDisplayPriority));\r
+                       eCYGroup.Initialize( "strCfgDrCYGroup", typeof(ECYGroup));\r
+                       eDark.Initialize( "strCfgSysDark", typeof(EDark));\r
+                       eFTGroup.Initialize( "strCfgDrFTGroup", typeof(EFTGroup));\r
+                       eHHGroup.Initialize( "strCfgDrHHGroup", typeof(EHHGroup));\r
+                       eBDGroup.Initialize( "strCfgDrBDGroup", typeof(EBDGroup));\r
                        Backup1BDHHGroup.Initialize("", "", typeof(EHHGroup));\r
                        Backup1BDPriotiry.Initialize("", "", typeof(EHitSoundPriority));\r
-                       eHitSoundPriorityCY.Initialize( cr.Label("strCfgDrCYPriority"), cr.Explanation("strCfgDrCYPriority"), typeof(EHitSoundPriority));\r
-                       eHitSoundPriorityFT.Initialize( cr.Label("strCfgDrFTPriority"), cr.Explanation("strCfgDrFTPriority"), typeof(EHitSoundPriority));\r
-                       eHitSoundPriorityHH.Initialize( cr.Label("strCfgDrHHPriority"), cr.Explanation("strCfgDrHHPriority"), typeof(EHitSoundPriority));\r
+                       eHitSoundPriorityCY.Initialize( "strCfgDrCYPriority", typeof(EHitSoundPriority));\r
+                       eHitSoundPriorityFT.Initialize( "strCfgDrFTPriority", typeof(EHitSoundPriority));\r
+                       eHitSoundPriorityHH.Initialize( "strCfgDrHHPriority", typeof(EHitSoundPriority));\r
 //                     eJudgePriority.Initialize("Judge Priority", Properties.Resources.strCfgSysJudgePriority, typeof(EJudgeDisplayPriority));\r
-                       eActiveInst.Initialize( cr.Label("strCfgSysPlayMode"), cr.Explanation("strCfgSysPlayMode"), typeof(EActiveInstrument));\r
-                       nShowLagType.Initialize( cr.Label("strCfgSysShowLagType"), cr.Explanation("strCfgSysShowLagType"), typeof(EShowLagType));\r
+                       eActiveInst.Initialize( "strCfgSysPlayMode", typeof(EActiveInstrument));\r
+                       nShowLagType.Initialize( "strCfgSysShowLagType", typeof(EShowLagType));\r
+\r
+                       eClickType.Initialize( "strCfgSysClickType", typeof( EClickType ) );\r
+                       nClickHighVolume.Initialize( "strCfgSysClickHighVolume", 0, 101 );\r
+                       nClickLowVolume.Initialize( "strCfgSysClickLowVolume", 0, 101 );\r
+\r
 \r
                        // integer\r
-                       nSleepPerFrameMs.Initialize("", "");\r
-                       nSleepUnfocusMs.Initialize("", "");\r
-                       nBGAlpha.Initialize( cr.Label("strCfgSysBGAAlpha"), cr.Explanation("strCfgSysBGAAlpha"), 0, 255);\r
-                       nPreSoundWeightMs.Initialize( cr.Label("strCfgSysPreSoundWait"), cr.Explanation("strCfgSysPreSoundWait"), 0, 10001);\r
-                       nPreImageWeightMs.Initialize( cr.Label("strCfgSysPreImageWait"), cr.Explanation("strCfgSysPreImageWait"), 0, 10001);\r
+                       nSleepPerFrameMs.Initialize( "strCfgSysSleepPerFrame", -1, 33 );\r
+                       nSleepUnfocusMs.Initialize( "strCfgSysSleepUnfocus", 0, 33 );\r
+                       nBGAlpha.Initialize( "strCfgSysBGAAlpha", 0, 256 );\r
+                       nPreSoundWeightMs.Initialize( "strCfgSysPreSoundWait", 0, 10001);\r
+                       nPreImageWeightMs.Initialize( "strCfgSysPreImageWait", 0, 10001);\r
                        nFontSizeDotSongSelect.Initialize("", "", 5);\r
-                       nAutoVolume.Initialize( cr.Label("strCfgSysAutoVolume"), cr.Explanation("strCfgSysAutoVolume"), 0, 101);\r
-                       nChipVolume.Initialize( cr.Label("strCfgSysChipVolume"), cr.Explanation("strCfgSysChipVolume"), 0, 101);\r
-                       nPlaySpeed.Initialize( cr.Label("strCfgSysPlaySpeed"), cr.Explanation("strCfgSysPlaySpeed"), 5, 41);\r
+                       nAutoVolume.Initialize( "strCfgSysAutoVolume", 0, 101);\r
+                       nChipVolume.Initialize( "strCfgSysChipVolume", 0, 101);\r
+                       nPlaySpeed.Initialize( "strCfgSysPlaySpeed", 5, 41);\r
                        nPlaySpeed.ValueFormatter = (x) =>\r
                        {\r
                                return "x" + (x / 20f).ToString("0.000");\r
                        };\r
-                       nHitRange.Perfect.Initialize("", "", 0);\r
-                       nHitRange.Great.Initialize("", "", 0);\r
-                       nHitRange.Good.Initialize("", "", 0);\r
-                       nHitRange.Poor.Initialize("", "", 0);\r
-                       nVelocityMin.LC.Initialize("", "", 0, 128);\r
-                       nVelocityMin.HH.Initialize("", "", 0, 128);\r
-                       nVelocityMin.SD.Initialize("", "", 0, 128);\r
-                       nVelocityMin.BD.Initialize("", "", 0, 128);\r
-                       nVelocityMin.HT.Initialize("", "", 0, 128);\r
-                       nVelocityMin.LT.Initialize("", "", 0, 128);\r
-                       nVelocityMin.FT.Initialize("", "", 0, 128);\r
-                       nVelocityMin.CY.Initialize("", "", 0, 128);\r
-                       nVelocityMin.RD.Initialize("", "", 0, 128);\r
-                       nRisky.Initialize( cr.Label("strCfgSysRisky"), cr.Explanation("strCfgSysRisky"), 0, 31);\r
-                       nWASAPIBufferSizeMs.Initialize( cr.Label("strCfgSysWASAPIBufSize"), cr.Explanation("strCfgSysWASAPIBufSize"), 0, 100001);\r
+                       nHitRange.Perfect.Initialize( "strCfgRangePerfect", 0 );\r
+                       nHitRange.Great.Initialize( "strCfgRangeGreat", 0 );\r
+                       nHitRange.Good.Initialize( "strCfgRangeGood", 0 );\r
+                       nHitRange.Poor.Initialize( "strCfgRangePoor", 0 );\r
+                       nVelocityMin.LC.Initialize( "strCfgDrLCVelocityMin", 0, 128 );\r
+                       nVelocityMin.HH.Initialize( "strCfgDrHHVelocityMin", 0, 128 );\r
+                       nVelocityMin.SD.Initialize( "strCfgDrSDVelocityMin", 0, 128 );\r
+                       nVelocityMin.BD.Initialize( "strCfgDrBDVelocityMin", 0, 128 );\r
+                       nVelocityMin.HT.Initialize( "strCfgDrHTVelocityMin", 0, 128 );\r
+                       nVelocityMin.LT.Initialize( "strCfgDrLTVelocityMin", 0, 128 );\r
+                       nVelocityMin.FT.Initialize( "strCfgDrFTVelocityMin", 0, 128 );\r
+                       nVelocityMin.CY.Initialize( "strCfgDrCYVelocityMin", 0, 128 );\r
+                       nVelocityMin.RD.Initialize( "strCfgDrRDVelocityMin", 0, 128 );\r
+                       nRisky.Initialize( "strCfgSysRisky", 0, 100 );\r
+                       nWASAPIBufferSizeMs.Initialize( "strCfgSysWASAPIBufSize", 0, 100001);\r
                        nChipDisplayTimeMs.Initialize("", "", 0);\r
                        nChipFadeoutTimeMs.Initialize("", "", 0);\r
 \r
-                       nMasterVolume.Initialize( cr.Label("strCfgSysMasterVolume"), cr.Explanation("strCfgSysMasterVolume"), 0, 101);\r
-                       nPoliphonicSounds.Initialize("", "", 1, 11);\r
+                       nMasterVolume.Initialize( "strCfgSysMasterVolume", 0, 101);\r
+                       nPolyphonicSounds.Initialize( "strCfgSysPolyphonicSounds", 1, 11 );\r
 \r
                        // dgb\r
                        for (EPart i = EPart.Drums; i <= EPart.Unknown; i++)\r
                        {\r
-                               bEmphasizePlaySound[i].Initialize( cr.Label("strCfgDgbChipSoundMonitor"), cr.Explanation("strCfgDgbChipSoundMonitor") );\r
-                               bReverse[i].Initialize( cr.Label("strCfgDgbReverse"), cr.Explanation("strCfgDgbReverse") );\r
-                               eRandom[i].Initialize( cr.Label("strCfgDgbRandom"), cr.Explanation("strCfgDgbRandom"), typeof(ERandom));\r
-                               bLight[i].Initialize( cr.Label("strCfgDgbLight"), cr.Explanation("strCfgDgbLight") );\r
-                               bDisplayCombo[i].Initialize( cr.Label("strCfgDgbDisplayCombo"), cr.Explanation("strCfgDgbDisplayCombo") );\r
-                               bDisplayJudge[i].Initialize( cr.Label("strCfgDgbDisplayJudge"), cr.Explanation("strCfgDgbDisplayJudge") );\r
-                               bGraph[i].Initialize( cr.Label("strCfgDgbDisplayGraph"), cr.Explanation("strCfgDgbDisplayGraph") );\r
-                               nScrollSpeed[i].Initialize( cr.Label("strCfgDgbScrollSpeed"), cr.Explanation("strCfgDgbScrollSpeed"), 1, 101);\r
+                               bEmphasizePlaySound[i].Initialize( "strCfgDgbChipSoundMonitor" );\r
+                               bReverse[i].Initialize( "strCfgDgbReverse" );\r
+                               eRandom[i].Initialize( "strCfgDgbRandom", typeof(ERandom) );\r
+                               bLight[i].Initialize( "strCfgDgbLight" );\r
+                               bDisplayCombo[i].Initialize( "strCfgDgbDisplayCombo" );\r
+                               bDisplayJudge[i].Initialize( "strCfgDgbDisplayJudge" );\r
+                               bGraph[i].Initialize( "strCfgDgbDisplayGraph" );\r
+                               nScrollSpeed[i].Initialize( "strCfgDgbScrollSpeed", 1, 101);\r
                                nScrollSpeed[i].ValueFormatter = (x) =>\r
                                        {\r
                                                return "x" + (x * 0.5f).ToString("0.0");\r
                                        };\r
-                               nInputAdjustTimeMs[i].Initialize( cr.Label("strCfgDgbInputAdjust"), cr.Explanation("strCfgDgbInputAdjust"), -99, 100);\r
+                               nInputAdjustTimeMs[i].Initialize( "strCfgDgbInputAdjust", -99, 100);\r
                                nJudgeLinePosOffset[i].Initialize("", "", -SampleFramework.GameWindowSize.Height, SampleFramework.GameWindowSize.Height + 1);\r
                                nViewerScrollSpeed[i].Initialize("", "", 1, 101);\r
-                               nMinComboDisp[i].Initialize( cr.Label("strCfgDgbMinComboDisp"), cr.Explanation("strCfgDgbMinComboDisp"), 2, 100001);\r
-                               nSuddenFrom[i].Initialize( cr.Label("strCfgDgbSuddenFrom"), cr.Explanation("strCfgDgbSuddenFrom"), 0, SampleFramework.GameWindowSize.Height + 1);\r
-                               nHiddenFrom[i].Initialize( cr.Label("strCfgDgbHiddenFrom"), cr.Explanation("strCfgDgbHiddenFrom"), 0, SampleFramework.GameWindowSize.Height + 1);\r
-                               eAutoGhost[i].Initialize( cr.Label("strCfgDgbAutoGhost"), cr.Explanation("strCfgDgbAutoGhost"), typeof(EAutoGhostData));\r
-                               eTargetGhost[i].Initialize( cr.Label("strCfgDgbTargetGhost"), cr.Explanation("strCfgDgbTargetGhost"), typeof(ETargetGhostData));\r
-                               eSudHidInv[i].Initialize( cr.Label("strCfgDgbSudHidInv"), cr.Explanation("strCfgDgbSudHidInv"), typeof(ESudHidInv));\r
+                               nMinComboDisp[i].Initialize( "strCfgDgbMinComboDisp", 2, 100001);\r
+                               nSuddenFrom[i].Initialize( "strCfgDgbSuddenFrom", 0, SampleFramework.GameWindowSize.Height + 1);\r
+                               nHiddenFrom[i].Initialize( "strCfgDgbHiddenFrom", 0, SampleFramework.GameWindowSize.Height + 1);\r
+                               eAutoGhost[i].Initialize( "strCfgDgbAutoGhost", typeof(EAutoGhostData));\r
+                               eTargetGhost[i].Initialize( "strCfgDgbTargetGhost", typeof(ETargetGhostData));\r
+                               eSudHidInv[i].Initialize( "strCfgDgbSudHidInv", typeof(ESudHidInv));\r
 \r
                                fJudgeLinePosOffsetBase[i].Initialize("", "");\r
                        }\r
 \r
                        string[] asiodevs = CEnumerateAllAsioDevices.GetAllASIODevices();\r
-                       strASIODevice.Initialize( cr.Label("strCfgSysASIODevice"), cr.Explanation("strCfgSysASIODevice"), asiodevs);\r
+                       strASIODevice.Initialize( "strCfgSysASIODevice", asiodevs);\r
 \r
                        int crdStep = 10;\r
-                       cdInstX.Drums.Both.Initialize("DrumsX(Both)", Properties.Resources.strCfgDispDrumsXBoth, 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
-                       cdInstX.Drums.DrOnly.Initialize("DrumsX(Dr)", Properties.Resources.strCfgDispDrumsXDr, 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
-                       cdInstX.Guitar.Both.Initialize("GuitarX(Both)", Properties.Resources.strCfgDispGuitarXBoth, 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
-                       cdInstX.Guitar.GBOnly.Initialize("GuitarX(GB)", Properties.Resources.strCfgDispGuitarXGB, 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
-                       cdInstX.Bass.Both.Initialize("BassX(Both)", Properties.Resources.strCfgDispBassXBoth, 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
-                       cdInstX.Bass.GBOnly.Initialize("BassX(GB)", Properties.Resources.strCfgDispBassXGB, 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
-\r
-                       cdDebugX.DrOnly.Initialize("DebugX(Dr)", Properties.Resources.strCfgDispDebugXDr, 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
-                       cdDebugX.Both.Initialize("DebugX(Both)", Properties.Resources.strCfgDispDebugXBoth, 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
-                       cdDebugX.GBOnly.Initialize("DebugX(GB)", Properties.Resources.strCfgDispDebugXGB, 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
-                       cdDebugY.DrOnly.Initialize("DebugY(Dr)", Properties.Resources.strCfgDispDebugYDr, 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
-                       cdDebugY.Both.Initialize("DebugY(Both)", Properties.Resources.strCfgDispDebugYBoth, 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
-                       cdDebugY.GBOnly.Initialize("DebugY(GB)", Properties.Resources.strCfgDispDebugYGB, 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
-\r
-                       cdMovieX.DrOnly.Initialize("MovieX(Dr)", Properties.Resources.strCfgDispMovieXDr, 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
-                       cdMovieX.Both.Initialize("MovieX(Both)", Properties.Resources.strCfgDispMovieXBoth, 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
-                       cdMovieX.GBOnly.Initialize("MovieX(GB)", Properties.Resources.strCfgDispMovieXGB, 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
-                       cdMovieY.DrOnly.Initialize("MovieY(Dr)", Properties.Resources.strCfgDispMovieYDr, 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
-                       cdMovieY.Both.Initialize("MovieY(Both)", Properties.Resources.strCfgDispMovieYBoth, 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
-                       cdMovieY.GBOnly.Initialize("MovieY(GB)", Properties.Resources.strCfgDispMovieYGB, 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
-\r
-                       cdComboX.Drums.Both.Initialize("ComboX(Both)", Properties.Resources.strCfgDispDrComboXBoth, 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
-                       cdComboX.Drums.DrOnly.Initialize("ComboX(Dr)", Properties.Resources.strCfgDispDrComboXDr, 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
-                       cdComboX.Guitar.Both.Initialize("ComboX(Both)", Properties.Resources.strCfgDispGtComboXBoth, 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
-                       cdComboX.Guitar.GBOnly.Initialize("ComboX(GB)", Properties.Resources.strCfgDispGtComboXGB, 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
-                       cdComboX.Bass.Both.Initialize("ComboX(Both)", Properties.Resources.strCfgDispBsComboXBoth, 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
-                       cdComboX.Bass.GBOnly.Initialize("ComboX(GB)", Properties.Resources.strCfgDispBsComboXGB, 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
-\r
-                       cdComboY.Drums.Both.Initialize("ComboY(Both)", Properties.Resources.strCfgDispDrComboYBoth, 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
-                       cdComboY.Drums.DrOnly.Initialize("ComboY(Dr)", Properties.Resources.strCfgDispDrComboYDr, 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
-                       cdComboY.Guitar.Both.Initialize("ComboY(Both)", Properties.Resources.strCfgDispGtComboYBoth, 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
-                       cdComboY.Guitar.GBOnly.Initialize("ComboY(GB)", Properties.Resources.strCfgDispGtComboYGB, 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
-                       cdComboY.Bass.Both.Initialize("ComboY(Both)", Properties.Resources.strCfgDispBsComboYBoth, 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
-                       cdComboY.Bass.GBOnly.Initialize("ComboY(GB)", Properties.Resources.strCfgDispBsComboYGB, 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
-\r
-                       cdJudgeLineY.Drums.Initialize("JudgeLine", Properties.Resources.strCfgDispDrJudgeLine, 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
-                       cdJudgeLineY.Guitar.Initialize("JudgeLine", Properties.Resources.strCfgDispGtJudgeLine, 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
-                       cdJudgeLineY.Bass.Initialize("JudgeLine", Properties.Resources.strCfgDispBsJudgeLine, 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
-\r
-                       cdJudgeY.Drums.Initialize("Judge", Properties.Resources.strCfgDispDrJudge, 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
-                       cdJudgeY.Guitar.Initialize("Judge", Properties.Resources.strCfgDispGtJudge, 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
-                       cdJudgeY.Bass.Initialize("Judge", Properties.Resources.strCfgDispBsJudge, 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
-\r
-                       cdLaneOrder.LC.Initialize("LC Order", Properties.Resources.strCfgDispLaneOrderLC, 0, 8);\r
-                       cdLaneOrder.HH.Initialize("HH Order", Properties.Resources.strCfgDispLaneOrderHH, 0, 8);\r
-                       cdLaneOrder.SD.Initialize("SD Order", Properties.Resources.strCfgDispLaneOrderSD, 0, 8);\r
-                       cdLaneOrder.BD.Initialize("BD Order", Properties.Resources.strCfgDispLaneOrderBD, 0, 8);\r
-                       cdLaneOrder.HT.Initialize("HT Order", Properties.Resources.strCfgDispLaneOrderHT, 0, 8);\r
-                       cdLaneOrder.LT.Initialize("LT Order", Properties.Resources.strCfgDispLaneOrderLT, 0, 8);\r
-                       cdLaneOrder.FT.Initialize("FT Order", Properties.Resources.strCfgDispLaneOrderFT, 0, 8);\r
-                       cdLaneOrder.CY.Initialize("CY Order", Properties.Resources.strCfgDispLaneOrderCY, 0, 8);\r
-\r
-                       cdLaneOrder.GtR.Initialize("R Order", Properties.Resources.strCfgDispLaneOrderGtR, 0, 4);\r
-                       cdLaneOrder.GtG.Initialize("G Order", Properties.Resources.strCfgDispLaneOrderGtG, 0, 4);\r
-                       cdLaneOrder.GtB.Initialize("B Order", Properties.Resources.strCfgDispLaneOrderGtB, 0, 4);\r
-                       cdLaneOrder.GtW.Initialize("W Order", Properties.Resources.strCfgDispLaneOrderGtW, 0, 4);\r
-\r
-                       cdLaneOrder.BsR.Initialize("R Order", Properties.Resources.strCfgDispLaneOrderBsR, 0, 4);\r
-                       cdLaneOrder.BsG.Initialize("G Order", Properties.Resources.strCfgDispLaneOrderBsG, 0, 4);\r
-                       cdLaneOrder.BsB.Initialize("B Order", Properties.Resources.strCfgDispLaneOrderBsB, 0, 4);\r
-                       cdLaneOrder.BsW.Initialize("W Order", Properties.Resources.strCfgDispLaneOrderBsW, 0, 4);\r
+                       cdInstX.Drums.Both.Initialize("strCfgDispDrumsXBoth", 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
+                       cdInstX.Drums.DrOnly.Initialize("strCfgDispDrumsXDr", 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
+                       cdInstX.Guitar.Both.Initialize("strCfgDispGuitarXBoth", 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
+                       cdInstX.Guitar.GBOnly.Initialize("strCfgDispGuitarXGB", 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
+                       cdInstX.Bass.Both.Initialize("strCfgDispBassXBoth", 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
+                       cdInstX.Bass.GBOnly.Initialize("strCfgDispBassXGB", 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
+\r
+                       cdDebugX.DrOnly.Initialize("strCfgDispDebugXDr", 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
+                       cdDebugX.Both.Initialize("strCfgDispDebugXBoth", 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
+                       cdDebugX.GBOnly.Initialize("strCfgDispDebugXGB", 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
+                       cdDebugY.DrOnly.Initialize("strCfgDispDebugYDr", 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
+                       cdDebugY.Both.Initialize("strCfgDispDebugYBoth", 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
+                       cdDebugY.GBOnly.Initialize("strCfgDispDebugYGB", 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
+\r
+                       cdMovieX.DrOnly.Initialize("strCfgDispMovieXDr", 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
+                       cdMovieX.Both.Initialize("strCfgDispMovieXBoth", 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
+                       cdMovieX.GBOnly.Initialize("strCfgDispMovieXGB", 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
+                       cdMovieY.DrOnly.Initialize("strCfgDispMovieYDr", 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
+                       cdMovieY.Both.Initialize("strCfgDispMovieYBoth", 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
+                       cdMovieY.GBOnly.Initialize("strCfgDispMovieYGB", 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
+\r
+                       cdComboX.Drums.Both.Initialize("strCfgDispDrComboXBoth", 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
+                       cdComboX.Drums.DrOnly.Initialize("strCfgDispDrComboXDr", 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
+                       cdComboX.Guitar.Both.Initialize("strCfgDispGtComboXBoth", 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
+                       cdComboX.Guitar.GBOnly.Initialize("strCfgDispGtComboXGB", 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
+                       cdComboX.Bass.Both.Initialize("strCfgDispBsComboXBoth", 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
+                       cdComboX.Bass.GBOnly.Initialize("strCfgDispBsComboXGB", 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
+\r
+                       cdComboY.Drums.Both.Initialize("strCfgDispDrComboYBoth", 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
+                       cdComboY.Drums.DrOnly.Initialize("strCfgDispDrComboYDr", 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
+                       cdComboY.Guitar.Both.Initialize("strCfgDispGtComboYBoth", 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
+                       cdComboY.Guitar.GBOnly.Initialize("strCfgDispGtComboYGB", 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
+                       cdComboY.Bass.Both.Initialize("strCfgDispBsComboYBoth", 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
+                       cdComboY.Bass.GBOnly.Initialize("strCfgDispBsComboYGB", 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
+\r
+                       cdJudgeLineY.Drums.Initialize("strCfgDispDrJudgeLine", 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
+                       cdJudgeLineY.Guitar.Initialize("strCfgDispGtJudgeLine", 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
+                       cdJudgeLineY.Bass.Initialize("strCfgDispBsJudgeLine", 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
+\r
+                       cdJudgeY.Drums.Initialize("strCfgDispDrJudge", 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
+                       cdJudgeY.Guitar.Initialize("strCfgDispGtJudge", 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
+                       cdJudgeY.Bass.Initialize("strCfgDispBsJudge", 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
+\r
+                       cdLaneOrder.LC.Initialize("strCfgDispLaneOrderLC", 0, 8);\r
+                       cdLaneOrder.HH.Initialize("strCfgDispLaneOrderHH", 0, 8);\r
+                       cdLaneOrder.SD.Initialize("strCfgDispLaneOrderSD", 0, 8);\r
+                       cdLaneOrder.BD.Initialize("strCfgDispLaneOrderBD", 0, 8);\r
+                       cdLaneOrder.HT.Initialize("strCfgDispLaneOrderHT", 0, 8);\r
+                       cdLaneOrder.LT.Initialize("strCfgDispLaneOrderLT", 0, 8);\r
+                       cdLaneOrder.FT.Initialize("strCfgDispLaneOrderFT", 0, 8);\r
+                       cdLaneOrder.CY.Initialize("strCfgDispLaneOrderCY", 0, 8);\r
+\r
+                       cdLaneOrder.GtR.Initialize("strCfgDispLaneOrderGtR", 0, 4);\r
+                       cdLaneOrder.GtG.Initialize("strCfgDispLaneOrderGtG", 0, 4);\r
+                       cdLaneOrder.GtB.Initialize("strCfgDispLaneOrderGtB", 0, 4);\r
+                       cdLaneOrder.GtW.Initialize("strCfgDispLaneOrderGtW", 0, 4);\r
+\r
+                       cdLaneOrder.BsR.Initialize("strCfgDispLaneOrderBsR", 0, 4);\r
+                       cdLaneOrder.BsG.Initialize("strCfgDispLaneOrderBsG", 0, 4);\r
+                       cdLaneOrder.BsB.Initialize("strCfgDispLaneOrderBsB", 0, 4);\r
+                       cdLaneOrder.BsW.Initialize("strCfgDispLaneOrderBsW", 0, 4);\r
 \r
                        SetEnterDelegates();\r
                }\r
@@ -923,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
@@ -959,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
@@ -990,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
@@ -1243,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
@@ -1259,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