ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2024-12-23 15:25:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed obsolete functions which accessed the obsolete joystick driver.

Browse source
This commit is contained in:
Jarl Gullberg 2017-06-20 15:54:28 +02:00
parent 8719556315
commit a5581d94af
No known key found for this signature in database
GPG key ID: 750FF6F6BDA72D23
3 changed files with 3 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/OpenTK/GameWindow.cs
View file

@ -79,12 +79,6 @@ namespace OpenTK
readonly Stopwatch watch = new Stopwatch(); readonly Stopwatch watch = new Stopwatch();
#pragma warning disable 612,618
readonly IJoystickDriver LegacyJoystick =
Factory.Default.CreateLegacyJoystickDriver();
#pragma warning restore 612,618
IGraphicsContext glContext; IGraphicsContext glContext;
bool isExiting = false; bool isExiting = false;
@ -581,19 +575,6 @@ namespace OpenTK
#endregion #endregion
#region Joysticks
/// <summary>
/// Gets a readonly IList containing all available OpenTK.Input.JoystickDevices.
/// </summary>
[Obsolete("Use OpenTK.Input.Joystick and GamePad instead")]
public IList<JoystickDevice> Joysticks
{
get { return LegacyJoystick.Joysticks; }
}
#endregion
#region --- GameWindow Timing --- #region --- GameWindow Timing ---
// TODO: Disabled because it is not reliable enough. Use vsync as a workaround. // TODO: Disabled because it is not reliable enough. Use vsync as a workaround.

3
src/OpenTK/OpenTK.csproj
View file

@ -440,9 +440,6 @@
<Compile Include="Input\IJoystickDriver.cs"> <Compile Include="Input\IJoystickDriver.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Input\IMouseDriver.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Input\IInputDriver.cs"> <Compile Include="Input\IInputDriver.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>

8
src/OpenTK/Platform/Factory.cs
View file

@ -192,14 +192,6 @@ namespace OpenTK.Platform
return defaultImplementation.CreateJoystickDriver(); return defaultImplementation.CreateJoystickDriver();
} }
[Obsolete]
public IJoystickDriver CreateLegacyJoystickDriver()
{
#pragma warning disable 612,618
return defaultImplementation.CreateLegacyJoystickDriver();
#pragma warning restore 612,618
}
public void RegisterResource(IDisposable resource) public void RegisterResource(IDisposable resource)
{ {
defaultImplementation.RegisterResource(resource); defaultImplementation.RegisterResource(resource);