The-Homebrew-Cloud/cemu-DS4Windows
2
0
Fork 0
mirror of https://github.com/cemu-project/DS4Windows.git synced 2025-01-13 16:49:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Enforce default X360 in more places

Browse Source 
Related to issue #683
This commit is contained in:
Travis Nickles 2019-05-02 20:18:59 -05:00
parent f01c86deee
commit b73f706ec2
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
DS4Windows/DS4Control/ScpUtil.cs
View File

@ -1700,9 +1700,9 @@ namespace DS4Windows
public int[] gyroMouseHorizontalAxis = new int[5] { 0, 0, 0, 0, 0 }; public int[] gyroMouseHorizontalAxis = new int[5] { 0, 0, 0, 0, 0 };
public bool[] trackballMode = new bool[5] { false, false, false, false, false }; public bool[] trackballMode = new bool[5] { false, false, false, false, false };
public double[] trackballFriction = new double[5] { 10.0, 10.0, 10.0, 10.0, 10.0 }; public double[] trackballFriction = new double[5] { 10.0, 10.0, 10.0, 10.0, 10.0 };
public OutContType[] outputDevType = new OutContType[5] { OutContType.None, public OutContType[] outputDevType = new OutContType[5] { OutContType.X360,
OutContType.None, OutContType.None, OutContType.X360, OutContType.X360,
OutContType.None, OutContType.None }; OutContType.X360, OutContType.X360 };
bool tempBool = false; bool tempBool = false;
@ -1824,10 +1824,10 @@ namespace DS4Windows
private string OutContDeviceString(OutContType id) private string OutContDeviceString(OutContType id)
{ {
string result = "None"; string result = "X360";
switch (id) switch (id)
{ {
case OutContType.None: break; case OutContType.None:
case OutContType.X360: result = "X360"; break; case OutContType.X360: result = "X360"; break;
case OutContType.DS4: result = "DS4"; break; case OutContType.DS4: result = "DS4"; break;
default: break; default: break;
@ -1838,10 +1838,10 @@ namespace DS4Windows
private OutContType OutContDeviceId(string name) private OutContType OutContDeviceId(string name)
{ {
OutContType id = OutContType.None; OutContType id = OutContType.X360;
switch (name) switch (name)
{ {
case "None": break; case "None":
case "X360": id = OutContType.X360; break; case "X360": id = OutContType.X360; break;
case "DS4": id = OutContType.DS4; break; case "DS4": id = OutContType.DS4; break;
default: break; default: break;

10
DS4Windows/DS4Forms/Options.cs
View File

@ -786,15 +786,15 @@ namespace DS4Windows.Forms
devOutContType = tempOutType; devOutContType = tempOutType;
switch(tempOutType) switch(tempOutType)
{ {
case OutContType.X360:
OutContTypeCb.SelectedIndex = 0;
defaults = xboxDefaults;
break;
case OutContType.DS4: case OutContType.DS4:
OutContTypeCb.SelectedIndex = 1; OutContTypeCb.SelectedIndex = 1;
defaults = ds4Defaults; defaults = ds4Defaults;
break; break;
default: break; case OutContType.X360:
default:
OutContTypeCb.SelectedIndex = 0;
defaults = xboxDefaults;
break;
} }
} }
else else