作業部屋#50802 CaptureキーがConfigで設定したキー含めて完全に使えるよう修正

#xxxxx 不要なファイル削除
#xxxxx 64bit対応の準備

diff --git a/DTXManiaプロジェクト/コード/全体/CDTXMania.cs b/DTXManiaプロジェクト/コード/全体/CDTXMania.cs
index c8c23ff..4422d93 100644 (file)
--- a/DTXManiaプロジェクト/コード/全体/CDTXMania.cs
+++ b/DTXManiaプロジェクト/コード/全体/CDTXMania.cs
@@ -1966,13 +1966,15 @@ for (int i = 0; i < 3; i++) {
                {
                        get
                        {
+                string strCPUmode = ( Environment.Is64BitProcess ) ? " [x64]" : " [x86]";
+
                                if ( DTXVmode.Enabled )
                                {
-                                       return "DTXViewer release " + VERSION;
+                                       return "DTXViewer release " + VERSION + strCPUmode;
                                }
                                else
                                {
-                                       return "DTXMania .NET style release " + VERSION;
+                                       return "DTXMania .NET style release " + VERSION + strCPUmode;
                                }
                        }
                }
@@ -2035,7 +2037,7 @@ for (int i = 0; i < 3; i++) {
                        }
                        Trace.WriteLine("");
                        Trace.WriteLine("DTXMania powered by YAMAHA Silent Session Drums");
-                       Trace.WriteLine(string.Format("Release: {0}", VERSION));
+                       Trace.WriteLine(string.Format("Release: {0} {1} mode.", VERSION, (Environment.Is64BitProcess)? "x64":"x86" ));
                        Trace.WriteLine("");
                        Trace.TraceInformation("----------------------");
                        Trace.TraceInformation("■ アプリケーションの初期化");
@@ -3158,11 +3160,9 @@ for (int i = 0; i < 3; i++) {
                        }
                        else
                        {
-                               //for ( int i = 0; i < 0x10; i++ )
+                               for ( int i = 0; i < 0x10; i++ )
                                {
-                    // 2019.04.21 kairera0467 作業部屋##50802 とりあえず問題解決できるまでキャプチャはF12固定とする
-                    //var captureCode = (SlimDX.DirectInput.Key) ConfigIni.KeyAssign[ (int)EKeyConfigPad.Capture ][ i ];
-                    var captureCode = SlimDX.DirectInput.Key.F12;
+                    var captureCode = (SlimDX.DirectInput.Key)ConfigIni.KeyAssign.System[ (int)EKeyConfigPad.Capture ][ i ].コード;
 
                                        if( (int) captureCode > 0 &&
                                                e.KeyCode == DeviceConstantConverter.KeyToKeys( captureCode ) )

diff --git a/実行時フォルダ/DTXCreatorSetting.config b/実行時フォルダ/DTXCreatorSetting.config
deleted file mode 100644 (file)
index 5895580..0000000
--- a/実行時フォルダ/DTXCreatorSetting.config
+++ /dev/null
@@ -1,364 +0,0 @@
-<?xml version="1.0"?>
-<AppSetting xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <RecentUsedFile />
-  <LanesInfo>
-    <Lanes>
-      <Name>BPM</Name>
-      <Checked>true</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>BEAT</Name>
-      <Checked>false</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>LC</Name>
-      <Checked>true</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>HH</Name>
-      <Checked>true</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>LP</Name>
-      <Checked>true</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>SD</Name>
-      <Checked>true</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>BD</Name>
-      <Checked>true</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>HT</Name>
-      <Checked>true</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>LT</Name>
-      <Checked>true</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>FT</Name>
-      <Checked>true</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>CY</Name>
-      <Checked>true</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>FI</Name>
-      <Checked>true</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>BN1</Name>
-      <Checked>true</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>BN2</Name>
-      <Checked>true</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>BN3</Name>
-      <Checked>true</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>BN4</Name>
-      <Checked>true</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>MLC</Name>
-      <Checked>true</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>MHH</Name>
-      <Checked>true</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>MCY</Name>
-      <Checked>true</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>MRD</Name>
-      <Checked>true</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>BGM</Name>
-      <Checked>true</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>SE1</Name>
-      <Checked>true</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>SE2</Name>
-      <Checked>true</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>SE3</Name>
-      <Checked>true</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>SE4</Name>
-      <Checked>true</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>SE5</Name>
-      <Checked>true</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>SE6</Name>
-      <Checked>false</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>SE7</Name>
-      <Checked>false</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>SE8</Name>
-      <Checked>false</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>SE9</Name>
-      <Checked>false</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>S10</Name>
-      <Checked>false</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>S11</Name>
-      <Checked>false</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>S12</Name>
-      <Checked>false</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>S13</Name>
-      <Checked>false</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>S14</Name>
-      <Checked>false</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>S15</Name>
-      <Checked>false</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>S16</Name>
-      <Checked>false</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>S17</Name>
-      <Checked>false</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>S18</Name>
-      <Checked>false</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>S19</Name>
-      <Checked>false</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>S20</Name>
-      <Checked>false</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>S21</Name>
-      <Checked>false</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>S22</Name>
-      <Checked>false</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>S23</Name>
-      <Checked>false</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>S24</Name>
-      <Checked>false</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>S25</Name>
-      <Checked>false</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>S26</Name>
-      <Checked>false</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>S27</Name>
-      <Checked>false</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>S28</Name>
-      <Checked>false</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>S29</Name>
-      <Checked>false</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>S30</Name>
-      <Checked>false</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>S31</Name>
-      <Checked>false</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>S32</Name>
-      <Checked>false</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>GtV</Name>
-      <Checked>true</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>GtR</Name>
-      <Checked>true</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>GtG</Name>
-      <Checked>true</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>GtB</Name>
-      <Checked>true</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>GtY</Name>
-      <Checked>true</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>GtP</Name>
-      <Checked>true</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>GtW</Name>
-      <Checked>true</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>GtL</Name>
-      <Checked>true</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>BsV</Name>
-      <Checked>true</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>BsR</Name>
-      <Checked>true</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>BsG</Name>
-      <Checked>true</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>BsB</Name>
-      <Checked>true</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>BsY</Name>
-      <Checked>true</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>BsP</Name>
-      <Checked>true</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>BsW</Name>
-      <Checked>true</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>BsL</Name>
-      <Checked>true</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>AVI</Name>
-      <Checked>true</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>BG1</Name>
-      <Checked>true</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>BG2</Name>
-      <Checked>true</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>BG3</Name>
-      <Checked>true</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>BG4</Name>
-      <Checked>true</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>BG5</Name>
-      <Checked>true</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>BG6</Name>
-      <Checked>false</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>BG7</Name>
-      <Checked>false</Checked>
-    </Lanes>
-    <Lanes>
-      <Name>BG8</Name>
-      <Checked>false</Checked>
-    </Lanes>
-  </LanesInfo>
-  <AutoFocus>true</AutoFocus>
-  <ConfigVersion>105</ConfigVersion>
-  <GraphicListColumnWidth>
-    <int>34</int>
-    <int>127</int>
-    <int>28</int>
-    <int>120</int>
-  </GraphicListColumnWidth>
-  <GuideIndex>3</GuideIndex>
-  <Height>475</Height>
-  <HViewScaleIndex>0</HViewScaleIndex>
-  <LastWorkFolder>J:\DTXManiaXG(ver.K)\workspace\branches\140707(ReBuild XGVersion)\実行時フォルダ</LastWorkFolder>
-  <Maximized>false</Maximized>
-  <MovieListColumnWidth>
-    <int>127</int>
-    <int>28</int>
-    <int>120</int>
-  </MovieListColumnWidth>
-  <NoPreviewBGM>true</NoPreviewBGM>
-  <PlaySoundOnWAVChipAllocated>true</PlaySoundOnWAVChipAllocated>
-  <RecentFilesNum>5</RecentFilesNum>
-  <ShowRecentFiles>true</ShowRecentFiles>
-  <SoundListColumnWidth>
-    <int>80</int>
-    <int>28</int>
-    <int>80</int>
-    <int>40</int>
-    <int>60</int>
-  </SoundListColumnWidth>
-  <SplitterDistance>296</SplitterDistance>
-  <ViewerInfo>
-    <Path>DTXManiaGR.exe</Path>
-    <PlayStartFromOption>-N</PlayStartFromOption>
-    <PlayStartOption>-N-1</PlayStartOption>
-    <PlayStopOption>-S</PlayStopOption>
-    <SoundType>ExclusiveWASAPI</SoundType>
-    <ASIODeviceNo>0</ASIODeviceNo>
-    <GRmode>false</GRmode>
-    <TimeStretch>false</TimeStretch>
-    <VSyncWait>true</VSyncWait>
-    <bViewerIsDTXV>false</bViewerIsDTXV>
-  </ViewerInfo>
-  <Width>600</Width>
-  <X>0</X>
-  <Y>0</Y>
-  <InitialOperationMode>false</InitialOperationMode>
-</AppSetting>
\ No newline at end of file

diff --git a/実行時フォルダ/xadec.dll b/実行時フォルダ/xadec.dll
deleted file mode 100644 (file)
index a415cdb..0000000
Binary files a/実行時フォルダ/xadec.dll and /dev/null differ