#30332 使用する.NETameworkのバージョンを3.5から2.0に変更。

#30332 FDKから抽出したソースで、注釈化していたキーボード/マウス/JOYPAD関係の入力処理を削除。

git-svn-id: http://svn.osdn.jp/svnroot/dtxmania/trunk@462 16f42ceb-6dc6-49c8-ba94-f2d53467949d

diff --git a/MidiInChecker2_Solution/MidiInChecker2_Project/MidiInChecker2.csproj b/MidiInChecker2_Solution/MidiInChecker2_Project/MidiInChecker2.csproj
index b9d0d88..f5b31e9 100644 (file)
--- a/MidiInChecker2_Solution/MidiInChecker2_Project/MidiInChecker2.csproj
+++ b/MidiInChecker2_Solution/MidiInChecker2_Project/MidiInChecker2.csproj
@@ -34,12 +34,6 @@
   </PropertyGroup>\r
   <ItemGroup>\r
     <Reference Include="System" />\r
-    <Reference Include="System.Xml.Linq">\r
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>\r
-    </Reference>\r
-    <Reference Include="System.Data.DataSetExtensions">\r
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>\r
-    </Reference>\r
     <Reference Include="System.Data" />\r
     <Reference Include="System.Deployment" />\r
     <Reference Include="System.Drawing" />\r

diff --git a/MidiInChecker2_Solution/MidiInChecker2_Project/PsuedoFDK/CInputManager.cs b/MidiInChecker2_Solution/MidiInChecker2_Project/PsuedoFDK/CInputManager.cs
index d578175..96631b3 100644 (file)
--- a/MidiInChecker2_Solution/MidiInChecker2_Project/PsuedoFDK/CInputManager.cs
+++ b/MidiInChecker2_Solution/MidiInChecker2_Project/PsuedoFDK/CInputManager.cs
@@ -29,18 +29,9 @@ namespace MidiInChecker2
                //public CInputManager( IntPtr hWnd )\r
                public CInputManager()\r
                {\r
-                       //this.directInput = new DirectInput();\r
-                       //this.timer = new CTimer( CTimer.E種別.MultiMedia );\r
-\r
                        this.list入力デバイス = new List<IInputDevice>( 10 );\r
                        this.listStrMidiDevices = new List<string>();\r
 \r
-                       //this.list入力デバイス.Add( new CInputKeyboard( hWnd, directInput ) );\r
-                       //this.list入力デバイス.Add( new CInputMouse( hWnd, directInput ) );\r
-                       //foreach ( DeviceInstance instance in this.directInput.GetDevices( DeviceClass.GameController, DeviceEnumerationFlags.AttachedOnly ) )\r
-                       //{\r
-                       //    this.list入力デバイス.Add( new CInputJoystick( hWnd, instance, directInput ) );\r
-                       //}\r
                        this.proc = new CWin32.MidiInProc( this.MidiInCallback );\r
                        nInputMidiDevices = CWin32.midiInGetNumDevs();\r
                        Trace.TraceInformation( "MIDI入力デバイス数: {0}", nInputMidiDevices );\r
@@ -70,28 +61,6 @@ namespace MidiInChecker2
 \r
                // メソッド\r
 \r
-               //public IInputDevice Joystick( int ID )\r
-               //{\r
-               //    foreach ( IInputDevice device in this.list入力デバイス )\r
-               //    {\r
-               //        if ( ( device.e入力デバイス種別 == E入力デバイス種別.Joystick ) && ( device.ID == ID ) )\r
-               //        {\r
-               //            return device;\r
-               //        }\r
-               //    }\r
-               //    return null;\r
-               //}\r
-               //public IInputDevice Joystick( string GUID )\r
-               //{\r
-               //    foreach ( IInputDevice device in this.list入力デバイス )\r
-               //    {\r
-               //        if ( ( device.e入力デバイス種別 == E入力デバイス種別.Joystick ) && device.GUID.Equals( GUID ) )\r
-               //        {\r
-               //            return device;\r
-               //        }\r
-               //    }\r
-               //    return null;\r
-               //}\r
                public IInputDevice MidiIn( int ID )\r
                {\r
                    foreach ( IInputDevice device in this.list入力デバイス )\r
@@ -107,7 +76,6 @@ namespace MidiInChecker2
                {\r
                        lock ( this.objMidiIn排他用 )\r
                        {\r
-                               //                              foreach( IInputDevice device in this.list入力デバイス )\r
                                for ( int i = this.list入力デバイス.Count - 1; i >= 0; i-- )      // #24016 2011.1.6 yyagi: change not to use "foreach" to avoid InvalidOperation exception by Remove().\r
                                {\r
                                        IInputDevice device = this.list入力デバイス[ i ];\r
@@ -115,8 +83,7 @@ namespace MidiInChecker2
                                        {\r
                                                device.tポーリング( bWindowがアクティブ中, bバッファ入力を使用する );\r
                                        }\r
-                                       // catch ( DirectInputException )                                                       // #24016 2011.1.6 yyagi: catch exception for unplugging USB joystick, and remove the device object from the polling items.\r
-                                       catch ( Exception e )                                                   // #24016 2011.1.6 yyagi: catch exception for unplugging USB joystick, and remove the device object from the polling items.\r
+                                       catch ( Exception )                                                     // #24016 2011.1.6 yyagi: catch exception for unplugging USB joystick, and remove the device object from the polling items.\r
                                        {\r
                                                this.list入力デバイス.Remove( device );\r
                                                device.Dispose();\r
@@ -182,14 +149,10 @@ namespace MidiInChecker2
 \r
                #region [ private ]\r
                //-----------------\r
-               //private DirectInput directInput;\r
-               //private IInputDevice _Keyboard;\r
-               //private IInputDevice _Mouse;\r
                private bool bDisposed済み;\r
                private List<uint> listHMIDIIN = new List<uint>( 8 );\r
                private object objMidiIn排他用 = new object();\r
                private CWin32.MidiInProc proc;\r
-               //private CTimer timer;\r
 \r
                private void MidiInCallback( uint hMidiIn, uint wMsg, int dwInstance, int dwParam1, int dwParam2 )\r
                {\r

diff --git a/MidiInChecker2_Solution/MidiInChecker2_Project/app.config b/MidiInChecker2_Solution/MidiInChecker2_Project/app.config
new file mode 100644 (file)
index 0000000..b7db281
--- /dev/null
+++ b/MidiInChecker2_Solution/MidiInChecker2_Project/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>\r
+<configuration>\r
+<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>\r

diff --git a/MidiInChecker2_Solution/MidiInChecker2_Project/bin/Release/MidiInChecker2_Project.exe b/MidiInChecker2_Solution/MidiInChecker2_Project/bin/Release/MidiInChecker2_Project.exe
deleted file mode 100644 (file)
index 1a2ff7f..0000000
Binary files a/MidiInChecker2_Solution/MidiInChecker2_Project/bin/Release/MidiInChecker2_Project.exe and /dev/null differ