The-Homebrew-Cloud/cemu-DS4Windows
2
0
Fork 0
mirror of https://github.com/cemu-project/DS4Windows.git synced 2024-11-22 17:29:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

And fixed custom mapping saving too

Browse Source
This commit is contained in:
jays2kings 2014-04-29 05:19:00 -04:00
parent 1de1b3f8cf
commit fb95a03df1
1 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
DS4Control/ScpUtil.cs
View File

@ -305,25 +305,24 @@ namespace DS4Control
} }
public static bool getHasCustomKeysorButtons(int device) public static bool getHasCustomKeysorButtons(int device)
{ {
return m_Config.customMapButtons.Count > 0 return m_Config.customMapButtons[device].Count > 0
|| m_Config.customMapKeys.Count > 0; || m_Config.customMapKeys[device].Count > 0;
} }
public static Dictionary<DS4Controls, X360Controls> getCustomButtons(int device) public static Dictionary<DS4Controls, X360Controls> getCustomButtons(int device)
{ {
return m_Config.customMapButtons; return m_Config.customMapButtons[device];
} }
public static Dictionary<DS4Controls, ushort> getCustomKeys(int device) public static Dictionary<DS4Controls, ushort> getCustomKeys(int device)
{ {
return m_Config.customMapKeys; return m_Config.customMapKeys[device];
} }
public static Dictionary<DS4Controls, DS4KeyType> getCustomKeyTypes(int device) public static Dictionary<DS4Controls, DS4KeyType> getCustomKeyTypes(int device)
{ {
return m_Config.customMapKeyTypes; return m_Config.customMapKeyTypes[device];
} }
public static bool Load()
public static void Load()
{ {
m_Config.Load(); return m_Config.Load();
} }
public static void LoadProfile(int device, System.Windows.Forms.Control[] buttons) public static void LoadProfile(int device, System.Windows.Forms.Control[] buttons)
{ {
@ -405,38 +404,37 @@ namespace DS4Control
public Int32 formHeight = 550; public Int32 formHeight = 550;
public Boolean startMinimized = false; public Boolean startMinimized = false;
public Dictionary<DS4Controls, DS4KeyType> customMapKeyTypes = null; public Dictionary<DS4Controls, DS4KeyType>[] customMapKeyTypes = {null, null, null, null};
public Dictionary<DS4Controls, UInt16> customMapKeys = null; public Dictionary<DS4Controls, UInt16>[] customMapKeys = { null, null, null, null };
public Dictionary<DS4Controls, X360Controls> customMapButtons = null; public Dictionary<DS4Controls, X360Controls>[] customMapButtons = { null, null, null, null };
public BackingStore() public BackingStore()
{ {
//for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
{ {
//for (int j = (int)MapSelector.Standard; j <= (int)MapSelector.ButtonMode; j++)
{ {
customMapKeyTypes = new Dictionary<DS4Controls, DS4KeyType>(); customMapKeyTypes[i] = new Dictionary<DS4Controls, DS4KeyType>();
customMapKeys = new Dictionary<DS4Controls, UInt16>(); customMapKeys[i] = new Dictionary<DS4Controls, UInt16>();
customMapButtons = new Dictionary<DS4Controls, X360Controls>(); customMapButtons[i] = new Dictionary<DS4Controls, X360Controls>();
} }
} }
} }
public X360Controls GetCustomButton(int device, DS4Controls controlName) public X360Controls GetCustomButton(int device, DS4Controls controlName)
{ {
if (customMapButtons.ContainsKey(controlName)) if (customMapButtons[device].ContainsKey(controlName))
return customMapButtons[controlName]; return customMapButtons[device][controlName];
else return X360Controls.None; else return X360Controls.None;
} }
public UInt16 GetCustomKey(int device, DS4Controls controlName) public UInt16 GetCustomKey(int device, DS4Controls controlName)
{ {
if (customMapKeys.ContainsKey(controlName)) if (customMapKeys[device].ContainsKey(controlName))
return customMapKeys[controlName]; return customMapKeys[device][controlName];
else return 0; else return 0;
} }
public DS4KeyType GetCustomKeyType(int device, DS4Controls controlName) public DS4KeyType GetCustomKeyType(int device, DS4Controls controlName)
{ {
if (customMapKeyTypes.ContainsKey(controlName)) if (customMapKeyTypes[device].ContainsKey(controlName))
return customMapKeyTypes[controlName]; return customMapKeyTypes[device][controlName];
else return 0; else return 0;
} }
@ -762,9 +760,9 @@ namespace DS4Control
if (Loaded) if (Loaded)
{ {
this.customMapButtons = customMapButtons; this.customMapButtons[device] = customMapButtons;
this.customMapKeys = customMapKeys; this.customMapKeys[device] = customMapKeys;
this.customMapKeyTypes = customMapKeyTypes; this.customMapKeyTypes[device] = customMapKeyTypes;
} }
// Only add missing settings if the actual load was graceful // Only add missing settings if the actual load was graceful
if (missingSetting && Loaded) if (missingSetting && Loaded)
@ -871,9 +869,9 @@ namespace DS4Control
if (Loaded) if (Loaded)
{ {
this.customMapButtons = customMapButtons; this.customMapButtons[device] = customMapButtons;
this.customMapKeys = customMapKeys; this.customMapKeys[device] = customMapKeys;
this.customMapKeyTypes = customMapKeyTypes; this.customMapKeyTypes[device] = customMapKeyTypes;
} }
// Only add missing settings if the actual load was graceful // Only add missing settings if the actual load was graceful
if (missingSetting && Loaded) if (missingSetting && Loaded)
@ -885,7 +883,7 @@ namespace DS4Control
public bool Load() public bool Load()
{ {
Boolean Loaded = true; Boolean Loaded = true;
Boolean missingSetting = false; /*Boolean missingSetting = false;
try try
{ {
@ -916,7 +914,7 @@ namespace DS4Control
} }
catch { } catch { }
if (missingSetting) if (missingSetting)
Save(); Save(); */
return Loaded; return Loaded;
} }
public bool Save() public bool Save()